Commit aa08c197 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.1

parents 6361a250 bca8a104

changes/ticket26062

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/networkstatus.c

+0 −1
Original line number Diff line number Diff line
@@ -1685,7 +1685,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);

}