aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-11-12 23:47:21 -0500
committerRoger Dingledine <arma@torproject.org>2012-11-12 23:47:21 -0500
commit88bb48e785609afeab6b63677f789036e25b34cf (patch)
treeb89b17a580e78eb63198bf79031d18d4d4cf8812 /src/or
parente567b4482a1473f586a8549d9311d989c2335172 (diff)
downloadtor-88bb48e785609afeab6b63677f789036e25b34cf.tar
tor-88bb48e785609afeab6b63677f789036e25b34cf.tar.gz
use a more logical operator
Fix a harmless bug when opting against publishing a relay descriptor because DisableNetwork is set. Fixes bug 7464; bugfix on 0.2.3.9-alpha.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 20a1e086a..34bf3e50f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1199,7 +1199,7 @@ run_scheduled_events(time_t now)
if (router_rebuild_descriptor(1)<0) {
log_info(LD_CONFIG, "Couldn't rebuild router descriptor");
}
- if (advertised_server_mode() & !options->DisableNetwork)
+ if (advertised_server_mode() && !options->DisableNetwork)
router_upload_dir_desc_to_dirservers(0);
}