0d6ee26af9
Merge branch 'maint-0.2.9'
...
This is an "ours" merge to avoid taking the version bump.
2016-11-07 16:39:15 -05:00
3dfecffa7d
bump version to 0.2.9.5-alpha
2016-11-07 16:38:53 -05:00
e0311f6a36
Remove from master more changes files already merged in release-0.2.9
2016-11-07 16:32:30 -05:00
3e3040a5d9
Merge branch 'maint-0.2.9'
...
Conflicts:
src/or/rendservice.c
2016-11-07 16:31:40 -05:00
9994404238
Make new changes files pass lintchanges
2016-11-07 16:19:05 -05:00
c2fc0941a5
Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9
2016-11-07 16:12:13 -05:00
7236e42684
Merge branch 'maint-0.2.9'
2016-11-07 16:10:55 -05:00
e482541cfb
Fix another 20499-broken test
2016-11-07 16:10:42 -05:00
d2071c36f6
Fix a unit test (broken by recent 20499 hacking)
2016-11-07 16:02:55 -05:00
a77187a52c
Add onion_service_non_anonymous file to man page
2016-11-08 07:45:02 +11:00
89edef6afb
Treat bacoff/schedule mismatch as a bug.
2016-11-07 11:05:57 -05:00
1934bf75ef
Merge branch 'maint-0.2.9'
2016-11-07 11:02:15 -05:00
293aca9929
Merge branch 'bug20534_029_squashed' into maint-0.2.9
2016-11-07 11:01:31 -05:00
e51f105c41
Reduce multiplier to 3, per teor's recommendation on #20534
...
(Three _is_ a good number for anonymity!)
2016-11-07 11:01:21 -05:00
85970f7047
Always increment delays by at least 1.
2016-11-07 11:01:21 -05:00
1fdf6e5814
Avoid integer overflow in delay calculation.
2016-11-07 11:01:21 -05:00
864c42f4d6
Count HTTP 503 as a download failure.
...
Because as Teor puts it: "[Resetting on 503] is exactly what we
don't want when relays are busy - imagine clients doing an automatic
reset every time they DoS a relay..."
Fixes bug 20593.
2016-11-07 11:01:21 -05:00
667ba776b1
Adjust download schedules per teor's #20534 recommendataions
2016-11-07 11:01:20 -05:00
800dff1308
Merge branch 'maint-0.2.9'
2016-11-07 09:32:21 -05:00
e4b793fe41
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-07 09:32:00 -05:00
2639fd08e7
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-11-07 09:31:36 -05:00
f5fdf188b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-11-07 09:30:42 -05:00
6c2174d44d
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-11-07 09:30:16 -05:00
db2571be61
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-11-07 09:29:54 -05:00
d82ffb77f3
Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9
2016-11-07 09:20:13 -05:00
858867a31a
Allow infinitely long delays in exponential-backoff downloads
...
It's only safe to remove the failure limit (per 20536) if we are in
fact waiting a bit longer each time we try to download.
Fixes bug 20534; bugfix on 0.2.9.1-alpha.
2016-11-07 09:19:35 -05:00
a415fee58a
Merge branch 'maint-0.2.9'
2016-11-07 09:09:06 -05:00
ce8a1e25a2
Merge branch 'bug20588' into maint-0.2.9
2016-11-07 09:08:58 -05:00
ea597832e2
Update geoip and geoip6 to the November 3 2016 database.
2016-11-07 15:05:19 +01:00
e819d420c5
When downloading certificates, check for related failures
...
If a consensus expires while we are waiting for certificates to download,
stop waiting for certificates.
If we stop waiting for certificates less than a minute after we started
downloading them, do not consider the certificate download failure a
separate failure.
Fixes bug 20533; bugfix on commit e0204f21
2016-11-08 00:01:20 +11:00
1bb28cecd9
Ensure relays don't make multiple connections during bootstrap
...
Relays do not deliberately launch multiple attempts, so the impact of this
bug should be minimal. This fix also defends against bugs like #20499 .
Bugfix on 0.2.8.1-alpha.
2016-11-07 23:05:55 +11:00
0bd55ed96a
Always Use EVP_aes_*_ctr() with openssl 1.1
...
(OpenSSL 1.1 makes EVP_CIPHER_CTX opaque, _and_ adds acceleration
for counter mode on more architectures. So it won't work if we try
the older approach, and it might help if we try the newer one.)
Fixes bug 20588.
2016-11-06 21:01:25 -05:00
4e15c2cb7d
Merge branch 'maint-0.2.9'
2016-11-06 20:32:21 -05:00
f6a3d213e4
Finish a sentence in a comment. Close 20576.
2016-11-06 20:31:50 -05:00
0b787b1daf
Workaround for warning in desc_encode_v3().
...
Fixes bug 20581.
2016-11-06 20:27:14 -05:00
61612f980d
Merge branch 'maint-0.2.9'
2016-11-06 20:24:29 -05:00
def41e93bd
In test_tortls_classify_client_ciphers(), s/ECDH/ECDHE/
...
(We weren't actually using these ciphers; we were just requing that
ciphers of that name existed.)
Patch from rubiate. Fixes 20460
2016-11-06 20:23:40 -05:00
5385a023e1
Do not apply 'max_failures' to random-exponential schedules.
...
Fixes bug 20536; bugfix on 0.2.9.1-alpha.
2016-11-06 20:08:11 -05:00
e9ce181955
Change a BUG warning to be a warning, not an info.
2016-11-06 20:01:24 -05:00
1b22eae120
Fix get_delay() code to avoid TIME_MAX overflow, not INT_MAX.
...
Fixes bug 20587; bugfix on 35bbf2e4a4
2016-11-06 19:50:08 -05:00
b28d818423
Remove changes files that will appear in 0.2.9.5-alpha.
2016-11-06 16:57:38 -05:00
c69bc895ca
Fix lintchanges warnings in master.
2016-11-06 16:48:52 -05:00
c8ec42de2f
Merge branch 'maint-0.2.9'
2016-11-06 16:41:32 -05:00
add164aa41
Fix warnings from lintChanges.py
2016-11-06 16:39:46 -05:00
0fed324c2c
Would you believe me if I said there were more 32-bit and clang warnings?
2016-11-04 15:47:28 -04:00
f45a581486
Fix some 32-bit warnings and clang warnings
2016-11-04 15:24:30 -04:00
c1bbc8405b
prop224: Fix memleaks in hs descriptor unit test
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2016-11-04 14:47:09 -04:00
7a78a37f1d
Fix memory leaks in test_hs_cache.c
2016-11-04 14:39:35 -04:00
ed4aebcd97
Fix more unit test leaks.
2016-11-04 14:35:15 -04:00
791625750e
prop224: Remove pointless unit test
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2016-11-04 14:31:28 -04:00
Nick Mathewson
teor
Karsten Loesing
David Goulet