diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-06 10:18:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-06 10:18:07 -0400 |
| commit | c19a3d1bf893b19d73b3a9038162c403817034ac (patch) | |
| tree | 4e64832c2227b4c2dc58b89a28196a36d88a9d21 | |
| parent | 83513a93a15c2e006fcf56d7d97ace5be340b6bc (diff) | |
| parent | 6eeedc02d8aee0bf1eda8e592764ec9c5df4add7 (diff) | |
| download | tor-c19a3d1bf893b19d73b3a9038162c403817034ac.tar.gz tor-c19a3d1bf893b19d73b3a9038162c403817034ac.zip | |
Merge branch 'maint-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 5af593eaae..f5b216f35f 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4730,7 +4730,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; |