nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-10 08:00:35 -04:00
commit aa08c19703
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket26062 Normal file
View File

@ -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.

1
src/or/networkstatus.c
View File

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