diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-04-20 17:01:41 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 18:10:17 -0400 |
| commit | ddd1b7be2dce0845e6c08dcb5404ae65940b9edb (patch) | |
| tree | 10b4438829d0ab01ecc9c83656d557bdbe027ab4 | |
| parent | df5c7fedbd938c5d4634eadcf53693e07d2c8182 (diff) | |
| download | tor-ddd1b7be2dce0845e6c08dcb5404ae65940b9edb.tar.gz tor-ddd1b7be2dce0845e6c08dcb5404ae65940b9edb.zip | |
Ignore SIGNAL NEWNYM on relay-only Tor instances
| -rw-r--r-- | changes/forget-rend-descs-on-newnym | 2 | ||||
| -rw-r--r-- | src/or/main.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym index f8758c2d58..0ea09e0800 100644 --- a/changes/forget-rend-descs-on-newnym +++ b/changes/forget-rend-descs-on-newnym @@ -5,6 +5,8 @@ o Minor bugfixes: - Don't allow v0 hidden service authorities to act as clients. Required by fix for bug 3000. + - Ignore SIGNAL NEWNYM commands on relay-only Tor instances. + Required by fix for bug 3000. o Code simplifications and refactoring: - Allow rend_client_send_introduction to fail without closing the AP connection permanently. diff --git a/src/or/main.c b/src/or/main.c index 3bf21693f4..a26be39fdf 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -842,6 +842,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(); |