summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug39424
-rw-r--r--src/or/router.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug3942 b/changes/bug3942
new file mode 100644
index 0000000000..f69c7bc2b2
--- /dev/null
+++ b/changes/bug3942
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Don't log that we have "decided to publish new relay descriptor" unless
+ we are actually publishing a descriptor. Fix for bug 3942; bugfix on
+ 0.2.3.2-alpha.
diff --git a/src/or/router.c b/src/or/router.c
index bf15689a15..eb201f4bc9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1738,8 +1738,10 @@ mark_my_descriptor_dirty_if_too_old(time_t now)
void
mark_my_descriptor_dirty(const char *reason)
{
+ const or_options_t *options = get_options();
+ if (server_mode(options) && options->_PublishServerDescriptor)
+ log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason);
desc_clean_since = 0;
- log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason);
if (!desc_dirty_reason)
desc_dirty_reason = reason;
}