8dcecfb000
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-14 18:01:04 +02:00
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
4041ff5543
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-14 17:40:58 +02:00
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
ffbc8a7c27
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-13 11:00:06 -05:00
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
d7052dd480
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-12 09:56:50 -05:00
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
b63404ebba
Changes file for ticket29026.
2019-02-08 08:52:46 -05:00
fc6e389a25
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-08 08:37:46 -05:00
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
eca0f87801
Add changes file for bug 29040.
2019-02-08 08:37:23 -05:00
7a9fb4c081
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-08 08:19:34 -05:00
4b36f9676d
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
2019-02-08 08:19:31 -05:00
1cc234ed00
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-05 08:10:30 -05:00
bca25eebfb
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-05 08:10:14 -05:00
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
790150e57a
Allow empty username/password in SOCKS5 username/password auth message
2019-01-26 11:06:33 +02:00
6144cf99ad
Capture more BUG warnings in util/time test
...
These are ones that happen on windows only.
Fixes bug 29161.
2019-01-23 12:37:12 -05:00
54c9c8b04f
If address/get_if_addrs6 can't findipv6, log WARN, not ERR
...
Fixes 29160, and allows 28668 (treating ERR logs as test failures)
to procede.
2019-01-23 12:04:57 -05:00
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
dd6c2b0ad7
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
...
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
2019-01-23 09:48:28 -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
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
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
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
f684cd8005
Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
...
Closes ticket 28668.
2019-01-16 15:47:33 -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
George Kadianakis
David Goulet
Nick Mathewson
Karsten Loesing
Roger Dingledine
rl1987
Kris Katterjohn
teor