aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-23 10:57:46 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-23 11:00:49 -0400
commit7b4b137dc9b97c74b55a5835926513d7333fff67 (patch)
treeda434051b0e6d072df4cb2dea9821c6c2c4c15e1 /changes
parent0cca8dc35a4e59944b83db0a36c7033e09fb98b4 (diff)
parent6ab10a546663b509d189ce16645b11af0e83d41c (diff)
downloadtor-7b4b137dc9b97c74b55a5835926513d7333fff67.tar
tor-7b4b137dc9b97c74b55a5835926513d7333fff67.tar.gz
Merge remote-tracking branch 'public/bug9229_025'
Conflicts: src/or/entrynodes.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug9229_0255
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug9229_025 b/changes/bug9229_025
new file mode 100644
index 000000000..ad7fd22c2
--- /dev/null
+++ b/changes/bug9229_025
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Avoid 60-second delays in the bootstrapping process when Tor
+ is launching for a second time while using bridges. Fixes bug 9229;
+ bugfix on 0.2.0.3-alpha.
+