summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-12Simplify some conditionals in circuit_get_open_circ_or_launch()teor
When entry_list_is_constrained() is true, guards_retry_optimistic() always returns true. When entry_list_is_constrained() is false, options->UseBridges is always false, therefore !options->UseBridges is always true, therefore (!options->UseBridges || ...) is always true. Cleanup after #24367.
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2Nick Mathewson
2017-12-12hs-v3: Don't lookup an intro point while cleaning it upGeorge Kadianakis
Commit e80893e51b0c0320838cbed8c46fd5b0fe608bef made tor call hs_service_intro_circ_has_closed() when we mark for close a circuit. When we cleanup intro points, we iterate over the descriptor's map of intro points and we can possibly mark for close a circuit. This was problematic because we would MAP_DEL_CURRENT() the intro point then free it and finally mark for close the circuit which would lookup the intro point that we just free in the map we are iterating over. This can't be done and leads to a use-after-free because the intro point will be returned successfully due to the fact that we are still in the loop iterating. In other words, MAP_DEL_CURRENT() followed by a digest256map_get() of the same object should never be done in the same loop. Fixes #24595 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-12Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-12rename changes fileNick Mathewson
2017-12-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'bug24167_025' into maint-0.2.5Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'bug24086_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid taking the 030 version of 23862.
2017-12-11Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'stack_fixes_032_v2' into maint-0.3.2Nick Mathewson
2017-12-11Add a changelog for the STACK fixesNick Mathewson
2017-12-11Move subtraction in rephist to try to avoid STACK warningNick Mathewson
(I do not know why this one is happening)
2017-12-11Stop checking for sandbox:new_element() failures: it can't fail.Nick Mathewson
(It can't fail because the tor_malloc*() family of functions can never return NULL) Found with STACK
2017-12-11transport_new() cannot fail; do not check for it to fail.Nick Mathewson
(It can't fail because the tor_malloc*() family of functions can never return NULL) Found with STACK.
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11sched: Avoid integer overflow when computing tcp_spaceDavid Goulet
In KIST, we could have a small congestion window value than the unacked packets leading to a integer overflow which leaves the tcp_space value to be humongous. This has no security implications but it results in KIST scheduler allowing to send cells on a potentially saturated connection. Found by #24423. Fixes #24590. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2Nick Mathewson
2017-12-11Run the download_status_increment test in a forked process.Nick Mathewson
It messes with global state somehow in a way that makes several of the entryconn tests fail now.
2017-12-07Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion