Release 3.6.0 (#239)
* chore: update dependencies * chore: update user agent for measurements * chore: we're now at v3.6.0 * chore: update assets * chore: update bundled CA * fix: address some goreportcard.com warnings * fix(debian/changelog): zap release that breaks out build scripts We're forcing the content of changelog with `dch`, so it's fine to not have any specific new release in there. * fix: make sure tests are passing locally Notably, I removed a chunk of code where we were checking for network activity. Now we don't fetch the databases and it's not important. Before, it was important because the databases are ~large. * fix: temporarily comment out riseupvn integration tests See https://github.com/ooni/probe/issues/1354 for work aimed at reducing the rate of false positives (thanks @cyBerta!)
This commit is contained in:
@@ -19,7 +19,7 @@ func (d ErrorWrapperDialer) DialContext(ctx context.Context, network, address st
|
||||
conn, err := d.Dialer.DialContext(ctx, network, address)
|
||||
err = errorx.SafeErrWrapperBuilder{
|
||||
// ConnID does not make any sense if we've failed and the error
|
||||
// does not make any sense (and is nil) if we succeded.
|
||||
// does not make any sense (and is nil) if we succeeded.
|
||||
DialID: dialID,
|
||||
Error: err,
|
||||
Operation: errorx.ConnectOperation,
|
||||
|
||||
@@ -38,7 +38,7 @@ func WithProxyURL(ctx context.Context, url *url.URL) context.Context {
|
||||
|
||||
// DialContext implements Dialer.DialContext
|
||||
func (d ProxyDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
||||
url := ContextProxyURL(ctx) // context URL takes precendence
|
||||
url := ContextProxyURL(ctx) // context URL takes precedence
|
||||
if url == nil {
|
||||
url = d.ProxyURL
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user