diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 08:02:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 08:02:10 -0400 |
| commit | e5acbbd16d29a5d3187bf2867c4ffa15451669bb (patch) | |
| tree | 654809c1225128b22b9c84fab72fd19d15a356d0 | |
| parent | 394f102ea6b0494cde97769a99d75e91b5743616 (diff) | |
| parent | aa08c197034a7dcd061f3c205a29dc1cb09641d3 (diff) | |
| download | tor-e5acbbd16d29a5d3187bf2867c4ffa15451669bb.tar.gz tor-e5acbbd16d29a5d3187bf2867c4ffa15451669bb.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -rw-r--r-- | changes/ticket26062 | 3 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket26062 b/changes/ticket26062 new file mode 100644 index 0000000000..1ee49d8608 --- /dev/null +++ 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 index dd82f66816..3d99dd9eec 100644 --- 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); } |