From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 10 May 2018 12:02:10 +0000 (-0400)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.11~27^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5acbbd16d29a5d3187bf2867c4ffa15451669bb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2
---

e5acbbd16d29a5d3187bf2867c4ffa15451669bb
diff --cc src/or/networkstatus.c
index dd82f66816,fdaa469faf..3d99dd9eec
--- 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);
  }
  
  /**