Merge branch 'maint-0.3.2' into release-0.3.2

2018-05-10 08:20:38 -04:00 · 2018-05-10 08:20:38 -04:00 · a15009bd38
parent 7e1102ff25 e5acbbd16d
commit a15009bd38
2 changed files with 3 additions and 1 deletions
--- a/changes/ticket26062
+++ b/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.
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@ -1654,7 +1654,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);
 }