summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-20 03:03:46 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-20 03:03:46 -0400
commit0a4649e6576cacc07c215c481fd1c500cd563a3b (patch)
treecc16d185370864236316f3ce9d8db4bc702a3217 /src/or/config.c
parenteecf8835fd8758a3f7a0837ff6c71d9e65d2dd5d (diff)
parentb8ffb00cf1ddf4ff1b64335f8677d600a948fffc (diff)
downloadtor-0a4649e6576cacc07c215c481fd1c500cd563a3b.tar.gz
tor-0a4649e6576cacc07c215c481fd1c500cd563a3b.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 4fcbd625d3..016f831b83 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1493,7 +1493,7 @@ options_act(or_options_t *old_options)
*/
if (!old_options ||
options_transition_affects_descriptor(old_options, options))
- mark_my_descriptor_dirty();
+ mark_my_descriptor_dirty("config change");
/* We may need to reschedule some directory stuff if our status changed. */
if (old_options) {