diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-07 12:20:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-07 12:20:08 -0400 |
| commit | 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 (patch) | |
| tree | beb24d4c04dd25e695ca9ebf7c5f2d46222df6e8 | |
| parent | 2725a88d5e3ec362a4f866f53c26ca20f943eb49 (diff) | |
| parent | 6d027a3823843030fc24d7224da3ca976f121b01 (diff) | |
| download | tor-98e5c63eb254cb4b744281b75093c4bd7f73b6c6.tar.gz tor-98e5c63eb254cb4b744281b75093c4bd7f73b6c6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4201 | 5 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug4201 b/changes/bug4201 new file mode 100644 index 0000000000..6f7d715af2 --- /dev/null +++ b/changes/bug4201 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + diff --git a/src/or/main.c b/src/or/main.c index 1a95e31c04..4948d59ec3 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1453,7 +1453,7 @@ run_scheduled_events(time_t now) /** 9. and if we're a server, check whether our DNS is telling stories to * us. */ - if (is_server && time_to_check_for_correct_dns < now) { + if (public_server_mode(options) && time_to_check_for_correct_dns < now) { if (!time_to_check_for_correct_dns) { time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); } else { |