Merge branch 'maint-0.3.1' into maint-0.3.2

2024-12-06 19:41:15 +01:00 · 2018-05-10 08:02:10 -04:00
parent 394f102ea6 aa08c19703
commit e5acbbd16d
2 changed files with 3 additions and 1 deletions
@@ -1654,7 +1654,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 ||
          options->HTTPTunnelPort_set);
 }