de66bd397c
Merge branch 'maint-0.3.4'
2018-08-21 19:20:37 -04:00
f68aab83ba
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 19:20:31 -04:00
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 19:16:40 -04:00
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-21 19:16:40 -04:00
df874ed0f1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 10:01:41 -04:00
9bc947dc18
Merge branch 'maint-0.3.4'
2018-08-21 10:01:41 -04:00
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
2018-08-21 10:01:38 -04:00
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
700f5bcc43
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:38:26 -04:00
e0b8c53f56
Merge branch 'maint-0.3.4'
2018-08-17 09:38:26 -04:00
87aacbfbba
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
2018-08-17 09:38:08 -04:00
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
ac721bd3b4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-17 09:29:46 -04:00
bedc0b0b8f
Merge branch 'maint-0.3.4'
2018-08-17 09:29:46 -04:00
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
64d9ea1413
In addrs_in_same_network_family(), choose IP subnet size based on IP type
2018-08-17 13:37:51 +10:00
936e2aa0de
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-16 08:37:11 -04:00
b49355915b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-16 08:37:11 -04:00
7e50d43f07
Merge branch 'maint-0.3.4'
2018-08-16 08:37:11 -04:00
c798957b59
Keep descriptor rotation time after HUP occurs.
2018-08-16 08:36:48 -04:00
d029a5162d
Merge branch 'ticket27096'
2018-08-16 08:32:06 -04:00
f454c28303
Fix test to pass without HOME env being set
2018-08-16 08:31:45 -04:00
571cb2f662
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 12:20:57 -04:00
0fc171a47b
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-15 12:20:57 -04:00
34083f00ab
Merge branch 'maint-0.3.4'
2018-08-15 12:20:57 -04:00
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
6c1d2549df
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-15 02:16:23 -04:00
1868982de6
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
2018-08-15 02:16:19 -04:00
b329cdf768
Merge remote-tracking branch 'public/bug26779_035'
2018-08-15 02:14:17 -04:00
57d0b8c3cd
Merge remote-tracking branch 'tor-github/pr/206'
2018-08-11 10:14:29 -04:00
c775689e96
Merge remote-tracking branch 'tor-github/pr/244'
2018-08-11 10:05:15 -04:00
61d5bcc1a2
Merge remote-tracking branch 'tor-github/pr/268'
2018-08-11 10:04:04 -04:00
b7ed61167f
Merge remote-tracking branch 'tor-github/pr/239'
2018-08-10 12:35:06 -04:00
5980cb8a19
Merge branch 'maint-0.3.4'
2018-08-09 08:47:26 -04:00
b4362b99cf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-09 08:47:25 -04:00
fde551a387
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-09 08:47:25 -04:00
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
159141a8c6
Merge branch 'ticket26947'
2018-08-08 18:07:32 -04:00
0f0dac0bfc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 18:06:15 -04:00
da4f4cb269
Merge branch 'maint-0.3.4'
2018-08-08 18:06:15 -04:00
c4d0d9bd24
Merge branch 'bug26948_033' into maint-0.3.3
2018-08-08 18:06:11 -04:00
26f1167e71
Merge branch 'bug26779_033' into bug26779_035
2018-08-08 15:50:29 -04:00
b66386865e
Detect broken stdatomic.h, and pretend that it isn't there at all
...
I hope that the debian clang maintainers will look at debian bug
903709 soon. But until they do, this should keep our users and our
CI happy on sid with clang.
Closes ticket 26779.
2018-08-08 15:49:39 -04:00
5f2e00241a
Add changes file
2018-08-08 19:07:50 +03:00
7a570b8182
Don't search for -lpthread on Windows
...
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present. Fixes bug 27081; bugfix on 1790dc6760
2018-08-08 09:56:51 -04:00
aaa5ca366e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-08 09:26:23 -04:00
7787150521
Merge branch 'maint-0.3.4'
2018-08-08 09:26:23 -04:00
00536254b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-08 09:26:23 -04:00
Nick Mathewson
cypherpunks
Neel Chauhan
George Kadianakis
rl1987
Karsten Loesing