aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-04-02 18:54:16 -0400
committerNick Mathewson <nickm@torproject.org>2012-04-02 18:59:21 -0400
commit6a9e693fbe5fc7c418e1c187b34a1496b62544cc (patch)
tree67ee691e8022c86967f0f2f6e0bf3d02d49b362c /src
parent42143979d8c594525583ea8de15abf18636f78b1 (diff)
downloadtor-6a9e693fbe5fc7c418e1c187b34a1496b62544cc.tar
tor-6a9e693fbe5fc7c418e1c187b34a1496b62544cc.tar.gz
Suppress "decided to publish new descriptor" message when not a server
The message only means that we're publishing a new descriptor when we are actually in some kind of server mode, and publication is on. Fix for bug 3942; bugfix on 0.2.3.2-alpha.
Diffstat (limited to 'src')
-rw-r--r--src/or/router.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index bf15689a1..eb201f4bc 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;
}