Nick Mathewson
cef844d017
Merge branch 'maint-0.3.2'
2017-11-30 12:07:59 -05:00
Nick Mathewson
fd73a168ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 12:07:59 -05:00
Nick Mathewson
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
Nick Mathewson
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
Nick Mathewson
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
Nick Mathewson
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
Nick Mathewson
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -05:00
Nick Mathewson
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
Nick Mathewson
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
Nick Mathewson
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
Nick Mathewson
a6a0c7a4ec
Merge branch 'trove-2017-009_025' into maint-0.2.5
2017-11-30 12:05:59 -05:00
Nick Mathewson
75509dc827
Fix changes file
2017-11-30 11:52:40 -05:00
Nick Mathewson
6c355d5763
Merge branch 'maint-0.3.2'
2017-11-30 11:48:12 -05:00
Nick Mathewson
25d50decb2
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 11:48:12 -05:00
Nick Mathewson
500f04a74e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 11:48:12 -05:00
Nick Mathewson
766d0a2d98
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 11:48:12 -05:00
Nick Mathewson
072e194a15
Merge branch 'bug21394_029' into maint-0.2.9
2017-11-30 11:48:06 -05:00
Nick Mathewson
a1b0a0b9cd
Avoid use-after-free error in 20020 fix
...
CID 1424328; found by coverity; bugfix on 93dbce4ddd98ca9a4ff2f;
bug not in any released Tor.
2017-11-30 11:44:15 -05:00
Nick Mathewson
1c7121be54
Merge branch 'bug24119_squashed'
2017-11-30 08:00:34 -05:00
Alex Xu (Hello71)
49a4961dad
Add changes/bug24119
2017-11-30 08:00:24 -05:00
Alex Xu (Hello71)
f1e8e54964
Simplify channel_rsa_id_group_set_badness, #24119
2017-11-30 08:00:24 -05:00
Fernando Fernandez Mancera
bef461ef1f
Switch -Wnormalized=id to -Wnormalized=nfkc
...
Modified -Wnormalized flag to nfkc option in configure.ac to avoid source code
identifier confusion.
Fixes #24467
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-11-29 20:29:55 -05:00
Nick Mathewson
27f017639f
Merge branch 'ticket20020'
2017-11-29 20:24:34 -05:00
Nick Mathewson
20fa6a3883
Merge branch 'maint-0.3.2'
2017-11-29 12:06:14 -05:00
Nick Mathewson
f0007f2b8d
Merge branch 'bug24050_029_squashed' into maint-0.3.2
2017-11-29 12:05:49 -05:00
Nick Mathewson
eb1976202e
Fix unit tests for 24050.
2017-11-29 12:05:36 -05:00
Nick Mathewson
6a9c3d6e3a
Merge branch 'maint-0.3.2'
2017-11-29 12:02:44 -05:00
Nick Mathewson
9b44bb49b4
Merge branch 'bug24050_029_squashed' into maint-0.3.2
2017-11-29 12:02:07 -05:00
Nick Mathewson
a94c486102
Make the cache_ipv4_answers default become 0 again, for real.
...
Fortunately, use_cached_ipv4_answers was already 0, so we wouldn't
actually use this info, but it's best not to have it.
Fixes bug 24050; bugfix on 0.2.6.3-alpha
2017-11-29 12:01:45 -05:00
David Goulet
6ab07419c8
Use local descriptor object to exclude self in path selection
...
TROVE-2017-12. Severity: Medium
When choosing a random node for a circuit, directly use our router
descriptor to exclude ourself instead of the one in the global
descriptor list. That list could be empty because tor could be
downloading them which could lead to not excluding ourself.
Closes #21534
2017-11-28 19:14:10 -05:00
David Goulet
91cee3c9e7
Guard: Don't pick ourselves as a possible Guard
...
TROVE-2017-12. Severity: Medium
Thankfully, tor will close any circuits that we try to extend to
ourselves so this is not problematic but annoying.
Part of #21534 .
2017-11-28 19:12:56 -05:00
David Goulet
3030741b5d
hs-v2: Remove any expiring intro from the retry list
...
TROVE-2017-13. Severity: High.
In the unlikely case that a hidden service could be missing intro circuit(s),
that it didn't have enough directory information to open new circuits and that
an intro point was about to expire, a use-after-free is possible because of
the intro point object being both in the retry list and expiring list at the
same time.
The intro object would get freed after the circuit failed to open and then
access a second time when cleaned up from the expiring list.
Fixes #24313
2017-11-28 18:41:29 -05:00
Nick Mathewson
1880a6a88e
Avoid asking for passphrase on junky PEM input
...
Fixes bug 24246 and TROVE-2017-011.
This bug is so old, it's in Matej's code. Seems to have been
introduced with e01522bbed
2017-11-27 15:25:03 -05:00
Nick Mathewson
2c0487ecfb
Handle NULL input to protover_compute_for_old_tor()
...
Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.
2017-11-27 15:16:30 -05:00
Nick Mathewson
2834cc9c18
Fix length of replaycache-checked data.
...
This is a regression; we should have been checking only the
public-key encrypted portion. Fixes bug 24244, TROVE-2017-009, and
CVE-2017-8819.
2017-11-27 15:12:19 -05:00
Nick Mathewson
b230860608
Merge branch 'maint-0.3.2'
2017-11-27 10:04:16 -05:00
Nick Mathewson
ef54610442
Merge branch 'ticket23856_025_01' into maint-0.3.2
2017-11-27 10:02:03 -05:00
David Goulet
8be50ca3ea
relay: Change bandwidth stats interval to 24 hours
...
Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.
Closes #23856
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-27 10:00:40 -05:00
Nick Mathewson
703ab95e9f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-27 09:09:34 -05:00
Nick Mathewson
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-27 09:09:34 -05:00
Nick Mathewson
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
Nick Mathewson
722c64fc23
Merge branch 'maint-0.3.2'
2017-11-27 09:09:34 -05:00
Nick Mathewson
4bb287aa39
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-27 09:09:34 -05:00
Sebastian Hahn
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
Alex Xu (Hello71)
2cda005ac4
Add fast paths to channel_rsa_id_group_set_badness, #24119
2017-11-24 12:42:51 -05:00
Nick Mathewson
c2f413e245
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-11-22 08:34:33 -05:00
Nick Mathewson
a7e777ab8e
bump to 0.3.2.5-alpha-dev
2017-11-22 08:34:02 -05:00
Nick Mathewson
80dbe06ce8
forwardport a changelog
2017-11-22 08:27:35 -05:00
Nick Mathewson
ce793ec0a9
Merge remote-tracking branch 'ahf-gitlab/ahf/24062-simpleperf'
2017-11-21 14:09:56 -05:00
Nick Mathewson
bf882b0373
re-run ./scripts/maint/annotate_ifdef_directives
2017-11-21 14:07:43 -05:00
