summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-28 07:41:45 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:06:18 -0500
commit404e9e5611eff39866c2e45133a60b40d7492f7e (patch)
tree9a554a28f85cf4ddf06a70cd12e47fe896e65b6c /src/or/config.c
parent08d3ca2e5657a759d10064a2acb62b0a47bc15ff (diff)
downloadtor-404e9e5611eff39866c2e45133a60b40d7492f7e.tar.gz
tor-404e9e5611eff39866c2e45133a60b40d7492f7e.zip
Have multiple guard contexts we can switch between.
Currently, this code doesn't actually have the contexts behave differently, (except for the legacy context), but it does switch back and forth between them nicely.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/or/config.c b/src/or/config.c
index b7b5cff35a..22e5dfdaa0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4536,13 +4536,6 @@ options_transition_allowed(const or_options_t *old,
return -1;
}
- if (old->UseDeprecatedGuardAlgorithm !=
- new_val->UseDeprecatedGuardAlgorithm) {
- *msg = tor_strdup("While Tor is running, changing "
- "UseDeprecatedGuardAlgorithm is not allowed.");
- return -1;
- }
-
if (sandbox_is_active()) {
#define SB_NOCHANGE_STR(opt) \
do { \