mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse source
This commit is contained in:
Nick Mathewson 2018-05-10 08:03:04 -04:00
commit 59812789f7
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

@ -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);
}