diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:13:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:13:17 -0400 |
| commit | 30003e43180561eb92f4146d3bf2a5f74523cda6 (patch) | |
| tree | c994c70839c8667284eab875f96b101ae04cff59 /src/or/router.c | |
| parent | 2dc9546eef6d748245d90b288f28ace1aa9b6f14 (diff) | |
| parent | 6dfc0d530113e055d91b68969c81595ddc749f07 (diff) | |
| download | tor-30003e43180561eb92f4146d3bf2a5f74523cda6.tar.gz tor-30003e43180561eb92f4146d3bf2a5f74523cda6.zip | |
Merge branch 'bug3000-022-part2-squashed' into 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 0ef4728a02..65afd49f7f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1107,10 +1107,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: |