summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug74644
-rw-r--r--src/or/main.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug7464 b/changes/bug7464
new file mode 100644
index 0000000000..9259cc74a3
--- /dev/null
+++ b/changes/bug7464
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - 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.
diff --git a/src/or/main.c b/src/or/main.c
index 20a1e086a4..34bf3e50f5 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);
}