aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-23 11:23:00 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-23 11:23:00 -0400
commit5de91d118ddc3b33bdbed33dbe7fee93f8790c46 (patch)
tree98932624c73482b5c45df6073ac33fc223b72b14 /changes
parentcfd0ee514c279bc6c7b7c299e001693a5aeb1f5f (diff)
parent802c063148e7aaf62e9f07ee5043a7451a888b82 (diff)
downloadtor-5de91d118ddc3b33bdbed33dbe7fee93f8790c46.tar
tor-5de91d118ddc3b33bdbed33dbe7fee93f8790c46.tar.gz
Merge branch 'bug11965_v2'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug119656
1 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug11965 b/changes/bug11965
new file mode 100644
index 000000000..a3bfd876b
--- /dev/null
+++ b/changes/bug11965
@@ -0,0 +1,6 @@
+ o Minor bugfixes:
+
+ - Avoid another 60-second delay when starting Tor in a
+ pluggable-transport-using configuration when we already have
+ cached descriptors for our bridges. Fixes bug 11965; bugfix on
+ 0.2.3.6-alpha.