summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-06-11 11:09:55 +0000
committerRoger Dingledine <arma@torproject.org>2008-06-11 11:09:55 +0000
commit1fde6994d5f6f24975dc7d6b4d3e4c2ce7a25631 (patch)
tree62429c11e02948507d50b1ca18fab9d354db4ba7
parent2f200e5f38b2d3a10b13ff0db54c9b8ce143a1a6 (diff)
downloadtor-1fde6994d5f6f24975dc7d6b4d3e4c2ce7a25631.tar.gz
tor-1fde6994d5f6f24975dc7d6b4d3e4c2ce7a25631.zip
If we change our MaxAdvertisedBandwidth and then reload torrc,
Tor won't realize it should publish a new relay descriptor. Fixes bug 688, reported by mfr. svn:r15129
-rw-r--r--ChangeLog3
-rw-r--r--src/or/config.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bc8fbd2de6..d4a3b342ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@ Changes in version 0.2.0.28-rc - 2008-06-??
for every single country code in the geoip db.
- Only warn when we fail to load the geoip file if we were planning to
include geoip stats in our extrainfo document.
+ - If we change our MaxAdvertisedBandwidth and then reload torrc,
+ Tor won't realize it should publish a new relay descriptor. Fixes
+ bug 688, reported by mfr.
- Fix unit tests in 0.2.0.27-rc.
- Fix compile on Windows.
diff --git a/src/or/config.c b/src/or/config.c
index 51644f8ea6..12a40af840 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3447,6 +3447,8 @@ options_transition_affects_descriptor(or_options_t *old_options,
new_options->_PublishServerDescriptor ||
old_options->BandwidthRate != new_options->BandwidthRate ||
old_options->BandwidthBurst != new_options->BandwidthBurst ||
+ old_options->MaxAdvertisedBandwidth !=
+ new_options->MaxAdvertisedBandwidth ||
!opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
!opt_streq(old_options->MyFamily, new_options->MyFamily) ||
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||