aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-30Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-30Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-11-30Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-30Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-30Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-30Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-11-30Merge branch 'trove-2017-012_030' into maint-0.3.0Nick Mathewson
2017-11-30Merge branch 'trove-2017-010_029' into maint-0.2.9Nick Mathewson
2017-11-30Merge branch 'trove-2017-012_025' into maint-0.2.5Nick Mathewson
2017-11-30Merge branch 'trove-2017-011_025' into maint-0.2.5Nick Mathewson
2017-11-30Merge branch 'trove-2017-009_025' into maint-0.2.5Nick Mathewson
2017-11-30Fix changes fileNick Mathewson
2017-11-30Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-30Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-11-30Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-30Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-30Merge branch 'bug21394_029' into maint-0.2.9Nick Mathewson
2017-11-30Avoid use-after-free error in 20020 fixNick Mathewson
CID 1424328; found by coverity; bugfix on 93dbce4ddd98ca9a4ff2f; bug not in any released Tor.
2017-11-30Merge branch 'bug24119_squashed'Nick Mathewson
2017-11-30Add changes/bug24119Alex Xu (Hello71)
2017-11-30Simplify channel_rsa_id_group_set_badness, #24119Alex Xu (Hello71)
2017-11-29Switch -Wnormalized=id to -Wnormalized=nfkcFernando Fernandez Mancera
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-29Merge branch 'ticket20020'Nick Mathewson
2017-11-29Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-29Merge branch 'bug24050_029_squashed' into maint-0.3.2Nick Mathewson
2017-11-29Fix unit tests for 24050.Nick Mathewson
2017-11-29Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-29Merge branch 'bug24050_029_squashed' into maint-0.3.2Nick Mathewson
2017-11-29Make the cache_ipv4_answers default become 0 again, for real.Nick Mathewson
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-28Use local descriptor object to exclude self in path selectionDavid Goulet
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-28Guard: Don't pick ourselves as a possible GuardDavid Goulet
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-28hs-v2: Remove any expiring intro from the retry listDavid Goulet
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-27Avoid asking for passphrase on junky PEM inputNick Mathewson
Fixes bug 24246 and TROVE-2017-011. This bug is so old, it's in Matej's code. Seems to have been introduced with e01522bbed6eea.
2017-11-27Handle NULL input to protover_compute_for_old_tor()Nick Mathewson
Fixes bug 24245; bugfix on 0.2.9.4-alpha. TROVE-2017-010.
2017-11-27Fix length of replaycache-checked data.Nick Mathewson
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-27Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-27Merge branch 'ticket23856_025_01' into maint-0.3.2Nick Mathewson
2017-11-27relay: Change bandwidth stats interval to 24 hoursDavid Goulet
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-27Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-27Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-27Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-27Merge branch 'maint-0.3.2'Nick Mathewson
2017-11-27Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-11-27Add bastet's ipv6 addressSebastian Hahn
Implements ticket 24394
2017-11-24Add fast paths to channel_rsa_id_group_set_badness, #24119Alex Xu (Hello71)
2017-11-22Merge branch 'maint-0.3.2'Nick Mathewson
"ours" merge to avoid version bump.
2017-11-22bump to 0.3.2.5-alpha-devNick Mathewson
2017-11-22forwardport a changelogNick Mathewson
2017-11-21Merge remote-tracking branch 'ahf-gitlab/ahf/24062-simpleperf'Nick Mathewson
2017-11-21re-run ./scripts/maint/annotate_ifdef_directivesNick Mathewson