diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 08:03:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 08:03:04 -0400 |
| commit | 59812789f7b16647762a7a79fc6db381e945a701 (patch) | |
| tree | 8191b237e701b612c44e9fe046f6e130a52c781c | |
| parent | abde29824ceb76bd21e728260796ecb4ff55151a (diff) | |
| parent | e5acbbd16d29a5d3187bf2867c4ffa15451669bb (diff) | |
| download | tor-59812789f7b16647762a7a79fc6db381e945a701.tar.gz tor-59812789f7b16647762a7a79fc6db381e945a701.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
| -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 1f21e8adb8..040405555c 100644 --- a/src/or/networkstatus.c +++ b/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); } |