summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug211235
-rw-r--r--src/or/config.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug21123 b/changes/bug21123
new file mode 100644
index 0000000000..cb165808a2
--- /dev/null
+++ b/changes/bug21123
@@ -0,0 +1,5 @@
+ o Minor bugfixes (dead code):
+ - Remove a rendundant check for PidFile changes at runtime in
+ options_transition_allowed(): this check is already performed regardless
+ of whether the sandbox is active. Fixes bug 21123; bugfix on commit
+ 2ae47d3 in 0.2.5.4-alpha.
diff --git a/src/or/config.c b/src/or/config.c
index 20103a0e8b..9785ec11da 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4522,7 +4522,6 @@ options_transition_allowed(const or_options_t *old,
} while (0)
SB_NOCHANGE_STR(Address);
- SB_NOCHANGE_STR(PidFile);
SB_NOCHANGE_STR(ServerDNSResolvConfFile);
SB_NOCHANGE_STR(DirPortFrontPage);
SB_NOCHANGE_STR(CookieAuthFile);