Merge remote-tracking branch 'yawning/bug13213'

This commit is contained in:
Nick Mathewson
2014-09-29 08:57:19 -04:00
2 changed files with 21 additions and 15 deletions
+4
View File
@@ -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.