summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-15 22:08:12 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-15 22:08:12 +0000
commitd9ad41767bf60f4ccae4bb8ed0dd1df40eed8054 (patch)
tree70e568d7b69df662744e7cf62e0a00da248ab279
parent6a8180657c45c5e9d197082d3c45278f79f6eb37 (diff)
downloadtor-d9ad41767bf60f4ccae4bb8ed0dd1df40eed8054.tar.gz
tor-d9ad41767bf60f4ccae4bb8ed0dd1df40eed8054.zip
backport r12507
svn:r12508
-rw-r--r--ChangeLog4
-rw-r--r--src/or/config.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e317c1a277..b74693dd96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ Changes in version 0.1.2.19 - 2007-??-??
- Fix a memory leak on exit relays; we were leaking a cached_resolve_t
on every successful resolve. Reported by Mike Perry.
+ o Minor bugfixes:
+ - Changing the ExitPolicyRejectPrivate setting should cause us to
+ rebuild our server descriptor.
+
Changes in version 0.1.2.18 - 2007-10-28
Tor 0.1.2.18 fixes many problems including crash bugs, problems with
diff --git a/src/or/config.c b/src/or/config.c
index 773e8adb5c..89a3442c84 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2876,6 +2876,8 @@ options_transition_affects_descriptor(or_options_t *old_options,
!opt_streq(old_options->Nickname,new_options->Nickname) ||
!opt_streq(old_options->Address,new_options->Address) ||
!config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) ||
+ old_options->ExitPolicyRejectPrivate !=
+ new_options->ExitPolicyRejectPrivate ||
old_options->ORPort != new_options->ORPort ||
old_options->DirPort != new_options->DirPort ||
old_options->ClientOnly != new_options->ClientOnly ||