Merge branch 'bug11965_v2'

2024-12-06 19:41:15 +01:00 · 2014-05-23 11:23:00 -04:00
parent cfd0ee514c 802c063148
commit 5de91d118d
2 changed files with 10 additions and 2 deletions
@@ -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.