Merge branch 'maint-0.3.1' into release-0.3.1
This commit is contained in:
commit
9ca9e6a1f7
|
@ -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.
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue