diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:14:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:14:50 -0400 |
| commit | f38ecd5ac0f21d25c838be6004925372d26a45aa (patch) | |
| tree | 7a546ec921e6a79d2d5cf94d7e92039f2c5bd670 /src/or/main.c | |
| parent | 8b33928676bdf751010e5d660e6e6cca9a152389 (diff) | |
| parent | 30003e43180561eb92f4146d3bf2a5f74523cda6 (diff) | |
| download | tor-f38ecd5ac0f21d25c838be6004925372d26a45aa.tar tor-f38ecd5ac0f21d25c838be6004925372d26a45aa.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 13b148f52..7a97a21b2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1018,6 +1018,13 @@ run_connection_housekeeping(int i, time_t now) static void signewnym_impl(time_t now) { + or_options_t *options = get_options(); + if (!proxy_mode(options)) { + log_info(LD_CONTROL, "Ignoring SIGNAL NEWNYM because client functionality " + "is disabled."); + return; + } + circuit_expire_all_dirty_circs(); addressmap_clear_transient(); rend_cache_purge(); |