Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
52bb38868c
|
@ -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.
|
|
@ -1584,7 +1584,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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue