aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-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-29Merge branch 'bug24050_029_squashed' into maint-0.3.2Nick Mathewson
2017-11-29Fix unit tests for 24050.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 '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.1' into maint-0.3.2Nick Mathewson
2017-11-27Add bastet's ipv6 addressSebastian Hahn
Implements ticket 24394
2017-11-22bump to 0.3.2.5-alpha-devNick Mathewson
2017-11-21bump version to 0.3.2.5-alphaNick Mathewson
2017-11-21Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2Nick Mathewson
2017-11-21add an explanatory comment about the error codesNick Mathewson
2017-11-20Merge branch 'bug23817_031' into maint-0.3.2Nick Mathewson
2017-11-20Check number of usable guards when applying md restrictions.George Kadianakis
We used to check whether we have enough filtered guards (guard set when torrc is applied) but that's not good enough, since that might be bad in some cases where many guards are not reachable (might cause overblocking and hence reacahbility issues). We now check if we have enough reachable filtered guards before applying md restrictions which should prevent overblocking.
2017-11-20Merge remote-tracking branches 'public/ticket24315_029' and ↵Nick Mathewson
'public/bug24198_029' into maint-0.3.2
2017-11-20Add another assertion to check for 24086 root causesNick Mathewson
In cdm_diff_ht_set_status(), we shouldn't have been allowing the status CDM_DIFF_PRESENT to be set if there wasn't actually a handle.
2017-11-20Correctly handle partial success in consensus diff calculation.Nick Mathewson
Previously, if store_multiple() reported a partial success, we would store all the handles it gave us as if they had succeeded. But it's possible for the diff to be only partially successful -- for example, if LZMA failed but the other compressors succeeded. Fixes bug 24086; bugfix on 0.3.1.1-alpha.
2017-11-20Recover better from empty/invalid storagedir filesNick Mathewson
If we can't read a file because of an FS issue, we say "we can't read that" and move on. But if we can't read it because it's empty, because it has no labels, or because its labels are misformatted, we should remove it. Fixes bug 24099; bugfix on 0.3.1.1-alpha.
2017-11-20In storagedir, take more care with errno on empty or mislabeled fileNick Mathewson
Required for 24099 fix -- we won't be able to act based on errno unless we can trust it.
2017-11-20Merge branch 'bug23681_029_01_squashed' into maint-0.3.2Nick Mathewson
2017-11-20circuit: Don't timeout opened C_INTRODUCING circuitDavid Goulet
A circuit with purpose C_INTRODUCING means that its state is opened but the INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when looking for timing out "building circuit". We have to wait on the rendezvous circuit to be opened before sending that cell so the intro circuit needs to be kept alive for at least that period of time. This patch makes that the purpose C_INTRODUCING is ignored in the circuit_expire_building() which means that we let the circuit idle timeout take care of it if we end up never using it. Fixes #23681 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-18Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-18Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-18Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-18Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-11-18Add an extra check in test_entrynodesNick Mathewson
This check makes it so we can reach "done" without setting "conn", and so the "if (conn)" check will not be redundant, and so coverity won't complain. Fixes CID 1422205. Not actually a bug.
2017-11-18Fix memory leak in unit test for bridge distribution config.Nick Mathewson
Also, check for the actual message, and fix some string confusion, while we're at it. Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-17Fix a clang unitialized-var warningNick Mathewson