Nick Mathewson
9323f5d1d4
Merge branch 'maint-0.3.4'
2018-08-23 20:07:47 -04:00
Nick Mathewson
90f6c590af
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
2018-08-23 20:07:39 -04:00
teor
08ad1f1e46
CI: Only post Appveyor IRC notifications when the build fails
...
Implements 27275.
2018-08-24 10:06:06 +10:00
Nick Mathewson
d50f90bfc4
Merge branch 'maint-0.3.4'
2018-08-23 19:37:32 -04:00
Nick Mathewson
6e0872e867
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-23 19:36:45 -04:00
Nick Mathewson
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-23 19:36:45 -04:00
Nick Mathewson
36bb11a650
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-23 19:36:45 -04:00
teor
cc4ea34a26
Silence a compilation warning on MSVC 2017 and clang-cl
...
test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().
Fixes bug 27185; bugfix on 0.2.2.2-alpha.
2018-08-24 09:15:04 +10:00
Nick Mathewson
2ae92ab973
Merge branch 'maint-0.3.4'
2018-08-23 14:26:04 -04:00
teor
fadcab920b
Bootstrap: check the exit policy and flag on descriptors
...
Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.
After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.
Fixes 27236; bugfix on 0.2.6.3-alpha.
2018-08-24 01:13:53 +10:00
teor
692efdad09
Update the message logged on relays when DirCache is disabled
...
Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
flag.
Fixes bug 24312; bugfix on 0.3.3.5-rc.
2018-08-23 19:13:25 +10:00
Nick Mathewson
bf5704051c
Merge remote-tracking branch 'teor/travis-osx-master'
2018-08-21 20:04:13 -04:00
Nick Mathewson
aac1e17f22
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
2018-08-21 20:04:03 -04:00
Nick Mathewson
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
2018-08-21 20:03:56 -04:00
Nick Mathewson
a29e9a901d
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
2018-08-21 20:03:41 -04:00
Nick Mathewson
05d62a3b73
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
2018-08-21 20:03:19 -04:00
Nick Mathewson
de66bd397c
Merge branch 'maint-0.3.4'
2018-08-21 19:20:37 -04:00
Nick Mathewson
f68aab83ba
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 19:20:31 -04:00
Nick Mathewson
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 19:16:40 -04:00
Nick Mathewson
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-21 19:16:40 -04:00
Nick Mathewson
df874ed0f1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 10:01:41 -04:00
Nick Mathewson
9bc947dc18
Merge branch 'maint-0.3.4'
2018-08-21 10:01:41 -04:00
Nick Mathewson
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
2018-08-21 10:01:38 -04:00
Nick Mathewson
85a8792344
Rewrite test_tortls_cert_matches_key()
...
Unlike the old test, this test no will no longer mess around with
the forbidden internals of any openssl data structures.
Additionally, it verifies several other behaviors of
tor_tls_cert_matches_key() that we had wanted to verify, such as
the possibility of the certificate's key not matching.
Fixes bug 27226; bugfix on 0.2.5.1-alpha.
2018-08-20 17:43:41 -04:00
Nick Mathewson
700f5bcc43
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:38:26 -04:00
Nick Mathewson
e0b8c53f56
Merge branch 'maint-0.3.4'
2018-08-17 09:38:26 -04:00
Nick Mathewson
87aacbfbba
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
2018-08-17 09:38:08 -04:00
cypherpunks
7b7dd9ae1c
rust/protover: don't accept whitespace in ProtoSet::from_str()
...
It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.
And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.
These were added in 9925d2e687Fixes #27177 . Bugfix on 0.3.3.5-rc.
2018-08-17 13:34:03 +00:00
Nick Mathewson
ac721bd3b4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:29:46 -04:00
Nick Mathewson
bedc0b0b8f
Merge branch 'maint-0.3.4'
2018-08-17 09:29:46 -04:00
cypherpunks
cc93f175ed
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()
...
It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.
Introduced in d1820c1516Fixes #27164 ; bugfix on 0.3.3.1-alpha.
2018-08-17 13:27:24 +00:00
Neel Chauhan
64d9ea1413
In addrs_in_same_network_family(), choose IP subnet size based on IP type
2018-08-17 13:37:51 +10:00
Nick Mathewson
936e2aa0de
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:37:11 -04:00
Nick Mathewson
b49355915b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-16 08:37:11 -04:00
Nick Mathewson
7e50d43f07
Merge branch 'maint-0.3.4'
2018-08-16 08:37:11 -04:00
George Kadianakis
c798957b59
Keep descriptor rotation time after HUP occurs.
2018-08-16 08:36:48 -04:00
Nick Mathewson
d029a5162d
Merge branch 'ticket27096'
2018-08-16 08:32:06 -04:00
rl1987
f454c28303
Fix test to pass without HOME env being set
2018-08-16 08:31:45 -04:00
Nick Mathewson
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
Nick Mathewson
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
Nick Mathewson
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
Nick Mathewson
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
Nick Mathewson
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
Nick Mathewson
b329cdf768
Merge remote-tracking branch 'public/bug26779_035'
2018-08-15 02:14:17 -04:00
Nick Mathewson
57d0b8c3cd
Merge remote-tracking branch 'tor-github/pr/206'
2018-08-11 10:14:29 -04:00
Nick Mathewson
c775689e96
Merge remote-tracking branch 'tor-github/pr/244'
2018-08-11 10:05:15 -04:00
Nick Mathewson
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
Nick Mathewson
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
