bfd1d70243
Merge branch 'maint-0.3.5'
2019-02-05 08:10:43 -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
e19222a0da
Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings
...
Fixes bug 29169.
2019-01-24 13:20:21 -05:00
8b254c1c70
Merge branch 'precommit_squashed'
2019-01-24 11:08:10 -05:00
99fffc6c2f
Add a pre-commit hook that runs code and changelog entry formatting checks
2019-01-24 08:03:17 -05:00
adeeb8841e
Merge branch 'maint-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
8e1e71cc0d
Merge branch 'bug29122'
2019-01-22 14:31:01 -05:00
6243133a71
Fix intermittent failures of test_circuitpadding_wronghop().
...
We fix it by disabling the scheduling of actual padding.
Fixes #29122 .
2019-01-22 14:30:43 -05:00
74e41155ff
Merge branch 'maint-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
21dd3ece62
Merge branch 'maint-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
00bc18b847
Merge remote-tracking branch 'tor-github/pr/653'
2019-01-22 08:13:14 -05:00
0ce4d23af5
Merge branch 'maint-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
d1af4d65df
Merge branch 'maint-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
16430fdaf5
Merge branch 'maint-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
49062d72b5
Start on 0.4.0.1-alpha changelog
2019-01-16 08:28:07 -05:00
139202174b
Remove changes entries that appeared in 0.3.5.7
2019-01-16 08:20:12 -05:00
2dd23086f1
Remove fallback scripts and whitelist
...
They have been extracted to a new fallback-scripts.git repository.
Closes ticket 27914.
2019-01-15 19:20:25 -05:00
6440fdb8de
Changes file for Ticket 28142.
2019-01-15 22:53:03 +00:00
9a61d3f5ad
Merge branch 'bug24953_squashed'
2019-01-15 08:25:35 -05:00
7fbe7a2563
In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
2019-01-15 08:25:29 -05:00
c281e587bb
Merge branch 'ticket28058_squashed'
2019-01-15 08:08:41 -05:00
30a925fe96
Add changes file
2019-01-15 08:08:29 -05:00
691dec5d46
Merge branch 'maint-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
cef910642e
Merge branch 'bug28989_squashed'
2019-01-11 18:56:57 -05:00
1bcececdd8
Fix CID 1442277
2019-01-11 18:56:48 -05:00
d21fa48cac
Merge branch 'maint-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
2f0e187191
Merge remote-tracking branch 'tor-github/pr/627'
2019-01-09 15:46:14 -05:00
578a93bbbc
Merge branch 'ticket28843'
2019-01-09 09:49:25 -05:00
0ed966fde1
Merge branch 'maint-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
d890ec29aa
Merge branch 'maint-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
3df1d29d9b
Merge branch 'bug28591_035_squashed'
2019-01-09 09:33:31 -05:00
44db455cc8
Dir: allow directory mirrors to serve future consensuses
...
When Tor's clock is behind the clocks on the authorities, allow Tor to
serve future consensuses.
Fixes bug 28654; bugfix on 0.3.0.1-alpha.
2019-01-09 09:32:28 -05:00
e6a4401200
Merge branch 'maint-0.3.5'
2019-01-09 08:52:10 -05:00
Roger Dingledine
Nick Mathewson
rl1987
George Kadianakis
Kris Katterjohn
Mike Perry
teor