Merge remote-tracking branch 'yawning/bug13213'

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.

src/or/config.c

@@ -1399,6 +1399,7 @@ options_act(const or_options_t *old_options)
 
   mark_transport_list();
   pt_prepare_proxy_list_for_config_read();
+  if (!options->DisableNetwork) {
     if (options->ClientTransportPlugin) {
       for (cl = options->ClientTransportPlugin; cl; cl = cl->next) {
         if (parse_client_transport_line(options, cl->value, 0)<0) {
@@ -1420,6 +1421,7 @@ options_act(const or_options_t *old_options)
         }
       }
     }
+  }
   sweep_transport_list();
   sweep_proxy_list();