Merge branch 'maint-0.3.1' into maint-0.3.2

diff --cc src/or/networkstatus.c
index dd82f668168bf90d8d2d11e9b1daf337b0f2adce,fdaa469faf58194418b864c34740487db91409f3..3d99dd9eec34bfc1357ab23bb6511e7d06f79244
--- 1/src/or/networkstatus.c
--- 2/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);
  }
  
  /**