summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-29 08:57:19 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-29 08:57:19 -0400
commitdc019b06548e49ce4ea2a1501715985b648f2606 (patch)
tree9e555f718343768ffcf1e9b08853cb071cd85c60 /changes
parent56f92ca02d2fb972bc476f235a545b3dc764f58d (diff)
parentfa60a64088ace76aa2a3c1a8347ee32d4bd3ee21 (diff)
downloadtor-dc019b06548e49ce4ea2a1501715985b648f2606.tar.gz
tor-dc019b06548e49ce4ea2a1501715985b648f2606.zip
Merge remote-tracking branch 'yawning/bug13213'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug132134
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug13213 b/changes/bug13213
new file mode 100644
index 0000000000..6dae8b06a1
--- /dev/null
+++ b/changes/bug13213
@@ -0,0 +1,4 @@
+ o Minor bugfixes (Bridges):
+ - When DisableNetwork is set, do not launch pluggable transport
+ plugins, and if any are running already, terminate the existing
+ instances. Resolves ticket 13213.