Merge branch 'maint-0.2.8' into release-0.2.8
This commit is contained in:
commit
399eebea54
|
@ -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 ?????.
|
|
@ -0,0 +1,3 @@
|
||||||
|
o Minor bugfixes (compilation):
|
||||||
|
- Cause the unit tests to compile correctly on mingw64 versions
|
||||||
|
that lack sscanf. Fixes bug 19213. Bugfix on 0.2.7.1-alpha.
|
|
@ -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
|
/* If we're going to tunnel our connections, we can ask for a lot more
|
||||||
* in a request. */
|
* in a request. */
|
||||||
if (!directory_fetches_from_authorities(options)) {
|
if (directory_must_use_begindir(options)) {
|
||||||
max = 500;
|
max = 500;
|
||||||
}
|
}
|
||||||
return max;
|
return max;
|
||||||
|
|
|
@ -4679,7 +4679,7 @@ test_util_writepid(void *arg)
|
||||||
contents = read_file_to_str(fname, 0, NULL);
|
contents = read_file_to_str(fname, 0, NULL);
|
||||||
tt_assert(contents);
|
tt_assert(contents);
|
||||||
|
|
||||||
int n = sscanf(contents, "%lu\n%c", &pid, &c);
|
int n = tor_sscanf(contents, "%lu\n%c", &pid, &c);
|
||||||
tt_int_op(n, OP_EQ, 1);
|
tt_int_op(n, OP_EQ, 1);
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
Loading…
Reference in New Issue