tor

commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb
parent 394f102ea6b0494cde97769a99d75e91b5743616
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 10 May 2018 08:02:10 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/ticket26062
 | 
3
+++
M
src/or/networkstatus.c
 | 
1
-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git 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.
diff --git 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);
 }