commit e5acbbd16d29a5d3187bf2867c4ffa15451669bb Merge: 394f102ea aa08c1970 Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 08:02:10 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
changes/ticket26062 | 3 +++ src/or/networkstatus.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-)
diff --cc src/or/networkstatus.c index dd82f6681,fdaa469fa..3d99dd9ee --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@@ -1654,9 -1685,7 +1654,8 @@@ any_client_port_set(const or_options_t return (options->SocksPort_set || options->TransPort_set || options->NATDPort_set || - options->ControlPort_set || - options->DNSPort_set); + options->DNSPort_set || + options->HTTPTunnelPort_set); }
/**