589b60d9e0
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-23 11:18:14 -05:00
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
e65d645a7b
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-22 12:27:50 -05:00
d9fde87607
correct bug number in 29042 changelog
2019-01-22 12:27:46 -05:00
8c6fcf864b
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-22 11:55:56 -05:00
4159d103d6
Merge branch 'bug29042_035' into maint-0.3.5
2019-01-22 11:55:53 -05:00
5dc6d2318c
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-22 08:04:55 -05:00
9ce1978b5e
Merge branch 'bug28979_035' into maint-0.3.5
2019-01-22 08:04:52 -05:00
448448120f
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-18 12:25:08 -05:00
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
0ce74ec7e0
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-16 14:43:53 -05:00
f0408b844f
Add changes file for bug 28981
...
The fix was in commit 61636ad989de674698601284957dacde53cc4984.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-16 14:40:31 -05:00
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
ade9204fc1
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-14 14:02:42 -05:00
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
0917f621e2
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-11 18:53:24 -05:00
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
830b659fed
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-09 09:38:27 -05:00
694e3c57fd
Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
2019-01-09 09:38:22 -05:00
7db07d6741
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-09 09:35:40 -05:00
380ae2b74b
Stop logging 'Your Guard' in circpathbias.c
2019-01-09 09:35:36 -05:00
7ce8548c28
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-09 08:52:10 -05:00
09472791d0
Add changes file for bug 28938
...
The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-09 08:52:05 -05:00
c59b572e93
Fix tor_ersatz_socketpair on IPv6-only systems
...
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-01-07 17:28:21 -06:00
f0faee0677
Add geoip entry to 0.3.5.7 changelog
2019-01-07 09:09:50 -05:00
85c5f58509
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-07 08:43:46 -05:00
cd9a85a522
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-07 08:43:46 -05:00
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
54049cb6f4
Start an 0.3.5.7 changelog
2019-01-04 15:03:01 -05:00
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
0644368009
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-03 21:34:43 -05:00
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
3ef8d4fb19
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-03 09:45:56 -05:00
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
aeb3f46097
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-03 09:44:15 -05:00
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
55474b9d99
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-03 09:02:40 -05:00
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
Nick Mathewson
rl1987
Kris Katterjohn
teor
Karsten Loesing