diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-02 10:40:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-02 10:40:39 -0400 |
| commit | 6eeedc02d8aee0bf1eda8e592764ec9c5df4add7 (patch) | |
| tree | aa938cd76ffcd040bd5bf114496cd3ad05cef12e | |
| parent | a32ca313c4bc67d56af5f345fa0129b50c006b12 (diff) | |
| download | tor-6eeedc02d8aee0bf1eda8e592764ec9c5df4add7.tar.gz tor-6eeedc02d8aee0bf1eda8e592764ec9c5df4add7.zip | |
Use directory_must_use_begindir to predict we'll surely use begindir
Previously, we used !directory_fetches_from_authorities() to predict
that we would tunnel connections. But the rules have changed
somewhat over the course of 0.2.8
| -rw-r--r-- | changes/bug19191 | 5 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug19191 b/changes/bug19191 new file mode 100644 index 0000000000..8670aaa7fd --- /dev/null +++ b/changes/bug19191 @@ -0,0 +1,5 @@ + o Minor bugfixes (downloading): + - Predict more correctly whether we'll be downloading over HTTP when we + determine the maximum length of a URL. This should avoid a "BUG" + warning about the Squid HTTP proxy and its URL limits. Fixes bug 19191; + bugfix on ?????. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index a08b5f3190..82376c073f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4674,7 +4674,7 @@ max_dl_per_request(const or_options_t *options, int purpose) } /* If we're going to tunnel our connections, we can ask for a lot more * in a request. */ - if (!directory_fetches_from_authorities(options)) { + if (directory_must_use_begindir(options)) { max = 500; } return max; |