Merge branch 'maint-0.3.2' into maint-0.3.3

changes/ticket26062

@@ -0,0 +1,3 @@
+  o Minor bugfixes (client):
+    - Don't consider Tor running as a client if the ControlPort is open. Fixes
+      bug 26062; bugfix on 0.2.9.4-alpha.

src/or/networkstatus.c

@@ -1679,7 +1679,6 @@ any_client_port_set(const or_options_t *options)
   return (options->SocksPort_set ||
           options->TransPort_set ||
           options->NATDPort_set ||
-          options->ControlPort_set ||
           options->DNSPort_set ||
           options->HTTPTunnelPort_set);
 }