aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-03-14 06:56:38 +1000
committerteor <teor@torproject.org>2019-03-14 06:56:38 +1000
commite021f89f3636d197058dddea4383632bdf466ff0 (patch)
treeae50cb724b3965fe9991d14c8aca101feb97d2c7
parentf3b17a6b261e1feef05dafac247b96b3ea90a521 (diff)
parent8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8 (diff)
downloadtor-e021f89f3636d197058dddea4383632bdf466ff0.tar.gz
tor-e021f89f3636d197058dddea4383632bdf466ff0.zip
Merge branch 'maint-0.2.9' into maint-0.3.4
-rw-r--r--changes/bug257334
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug25733 b/changes/bug25733
new file mode 100644
index 0000000000..775c1ae00e
--- /dev/null
+++ b/changes/bug25733
@@ -0,0 +1,4 @@
+ o Minor bugfixes (Assert crash):
+ - Avoid an assert in the circuit build timeout code if we fail to
+ allow any circuits to actually complete. Fixes bug 25733;
+ bugfix on 0.2.2.2-alpha.