diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 12:33:17 -0400 |
| commit | 676f71054f11727fdfa8707979d8c6fe143c9333 (patch) | |
| tree | 682020f063aad9523d69dd7bcea8126c6e46ee91 /src/or/router.c | |
| parent | a74d4182f106b1b89367cf1a640b1140d3d35d2c (diff) | |
| parent | d993b0448508d910be0c26096fe710b13e8af4e7 (diff) | |
| download | tor-676f71054f11727fdfa8707979d8c6fe143c9333.tar tor-676f71054f11727fdfa8707979d8c6fe143c9333.tar.gz | |
Merge remote-tracking branch 'public/bug6507' into maint-0.2.3
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 352c456f1..38f1cdd49 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -797,7 +797,7 @@ int check_whether_dirport_reachable(void) { const or_options_t *options = get_options(); - return !options->DirPort || + return !options->DirPort_set || options->AssumeReachable || net_is_disabled() || can_reach_dir_port; @@ -1115,7 +1115,8 @@ int server_mode(const or_options_t *options) { if (options->ClientOnly) return 0; - return (options->ORPort || options->ORListenAddress); + /* XXXX024 I believe we can kill off ORListenAddress here.*/ + return (options->ORPort_set || options->ORListenAddress); } /** Return true iff we are trying to be a non-bridge server. |