diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:14:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:14:50 -0400 |
| commit | f38ecd5ac0f21d25c838be6004925372d26a45aa (patch) | |
| tree | 7a546ec921e6a79d2d5cf94d7e92039f2c5bd670 /src/or/router.c | |
| parent | 8b33928676bdf751010e5d660e6e6cca9a152389 (diff) | |
| parent | 30003e43180561eb92f4146d3bf2a5f74523cda6 (diff) | |
| download | tor-f38ecd5ac0f21d25c838be6004925372d26a45aa.tar.gz tor-f38ecd5ac0f21d25c838be6004925372d26a45aa.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/router.c b/src/or/router.c index 8edbb47058..820ee1e1d0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1112,10 +1112,10 @@ set_server_advertised(int s) int proxy_mode(or_options_t *options) { - return (options->SocksPort != 0 || options->SocksListenAddress || - options->TransPort != 0 || options->TransListenAddress || - options->NATDPort != 0 || options->NATDListenAddress || - options->DNSPort != 0 || options->DNSListenAddress); + return (options->SocksPort != 0 || + options->TransPort != 0 || + options->NATDPort != 0 || + options->DNSPort != 0); } /** Decide if we're a publishable server. We are a publishable server if: |