669d79d2d6
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-08 07:49:44 -05:00
9fe6ffa588
Use the correct preprocessor macro for Linux
...
Also combine all of the checks into one if-tree as only one of them
should actually succeed.
2016-12-08 07:48:19 -05:00
d838a812bd
Merge branch 'bug19960_2' into maint-0.2.9
2016-12-08 07:48:14 -05:00
9ead4e926f
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-07 18:28:39 -05:00
f602172dba
Merge branch 'maint-0.2.8' into maint-0.2.9
...
(ours merge, to avoid taking 20865 fix)
2016-12-07 18:28:09 -05:00
10baf2c684
Backport the other sierra fix in 20865.
...
They added clock_gettime(), but with tv_nsec as a long, whereas
tv_usec is a __darwin_suseconds_t (a.k.a. 'int'). Now, why would
they do that? Are they preparing for a world where there are more
than 2 billion nanoseconds per second? Are they planning for having
int be less than 32 bits again? Or are they just not paying
attention to the Darwin API?
Also, they forgot to mark clock_gettime() as Sierra-only, so even
if we fixed the issue here, we'd still be stick with portability
breakage like we were for 0.2.9.
So, just disable clock_gettime() on apple.
2016-12-07 18:24:28 -05:00
53d4e89626
Netbsd doesn't have ipfw, only the regular pf transport stuff.
...
Attempted fix for 19960.
Also, fixes a typo.
2016-12-07 15:22:44 -05:00
fe0bfbf755
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-07 11:25:54 -05:00
e7ade23f97
Increase verbosity on options/validate__transproxy
...
This is an attempt to figure out what's up with #19960
2016-12-07 11:24:58 -05:00
c8bcbf5ac2
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-07 11:14:46 -05:00
0815f96416
Fix a BUG() warning from next_random_exponential_delay().
...
Fixes 20875; this code is as suggested by teor on the ticket. Thanks!
2016-12-07 11:13:11 -05:00
78cb55e42f
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-07 11:09:23 -05:00
fce425e3ff
Increase tolerances in util/monotonic_time tests
...
This is an attempt to fix #19974 .
2016-12-07 11:08:54 -05:00
9b37d540b0
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-07 10:52:21 -05:00
d6ca36defa
Merge branch 'bug20710_025' into maint-0.2.9
2016-12-07 10:52:12 -05:00
045a50e45a
Forgot to add changes file for 20710.
2016-12-07 10:51:39 -05:00
99683ee561
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-05 10:07:04 -05:00
30f05167f1
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-05 10:06:45 -05:00
cc34ba1cec
Merge branch 'getentropy_028' into maint-0.2.8
2016-12-05 10:06:16 -05:00
714aeedc52
20865: Don't use getentropy() on OSX Sierra.
...
Tor 0.2.9 has a broader range of fixes and workarounds here, but for
0.2.8, we're just going to maintain the existing behavior.
(The alternative would be to backport both
1eba08805416fcbd21c9
2016-12-05 10:02:33 -05:00
5032489e80
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-05 08:21:40 -05:00
cf2f36b8b4
Test for .git as readable instead of a dir to support worktrees
...
Fixes #20492 .
2016-12-05 08:21:17 -05:00
b4c648c6c0
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-05 08:13:09 -05:00
42ec60ecfb
Fix changes file for 20864: 20638 _did_ get into 0.2.9
2016-12-05 08:12:10 -05:00
a23c581d13
Merge remote-tracking branch 'teor/bug20864-029' into maint-0.2.9
2016-12-05 08:10:48 -05:00
4178708f3c
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-05 08:05:45 -05:00
0d0c7a1164
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-05 08:05:37 -05:00
2a365413eb
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-12-05 07:54:22 -05:00
ebf243bc5b
Changes file for 20864
2016-12-03 06:35:45 +11:00
e8ce57e6e8
Move a comment in test_single_onion_poisoning
2016-12-03 06:30:58 +11:00
8d42aab3f6
Add a missing return value check in test_single_onion_poisoning
2016-12-03 06:30:06 +11:00
fdd368d656
Remove a double-free in test_single_onion_poisoning
...
We were freeing both dir{1,2} directly, and service_{1,2}->directory via
rend_service_free, even though they are the same pointer.
2016-12-03 06:27:32 +11:00
c100c5c69b
Refactor poison_dir allocation and free in test_single_onion_poisoning
...
This pattern is much less error-prone when future changes are made.
2016-12-03 06:25:46 +11:00
567852fcde
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-02 12:10:33 -05:00
907cd8a0cf
protover: Fix old tor hardcoded version check
...
When computing old Tor protocol line version in protover, we were looking at
0.2.7.5 twice instead of the specific case for 0.2.9.1-alpha.
Fixes #20810
Signed-off-by: David Goulet <dgoulet@torproject.org >
2016-12-02 12:09:08 -05:00
ef7df10972
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-02 12:01:00 -05:00
8b93cbc16d
Merge branch 'bug20716_026' into maint-0.2.9
2016-12-02 12:00:46 -05:00
b236e18739
Forward-port 0.2.8.10 to releasenotes and changelog
2016-12-02 11:23:55 -05:00
62ead6d326
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-02 11:20:34 -05:00
70d39859d6
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-02 11:20:27 -05:00
cf762c663d
Bump to 0.2.9.6-rc-dev
2016-12-02 11:20:23 -05:00
1122137fa0
Bump to 0.2.8.10-dev
2016-12-02 11:19:53 -05:00
a3e07633a4
expand a bit on the resolve_my_address issue
...
looks good!
2016-12-02 10:16:57 -05:00
9bc0593a84
Pick a release date.
2016-12-02 08:23:33 -05:00
9271dc5a6b
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-02 07:40:45 -05:00
1221c5aa02
test_single_onion_poisoning: Free dir[12] on all paths
...
Coverity doesn't like it when there are paths to the end of the
function where something doesn't get freed, even when those paths
are only reachable on unit test failure.
Fixes CID 1372899 and CID 1372900. Bug not in any released Tor.
2016-12-02 07:39:14 -05:00
b7613e0543
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-01 13:36:53 -05:00
9e297f8197
Bump to 0.2.9.6-rc
2016-12-01 13:36:38 -05:00
2f7c10df12
Merge branch 'maint-0.2.9' into release-0.2.9
2016-12-01 13:35:46 -05:00
82bd2af78d
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-12-01 13:35:34 -05:00
Nick Mathewson
cypherpunks
J. Ryan Stinnett
teor
David Goulet
Roger Dingledine