diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-10-25 12:03:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-10-25 12:03:42 -0400 |
| commit | f249074e419a7f7fe6d0943516cc5d53a88ed435 (patch) | |
| tree | f6eebcd69d9b08a43a64f80ba4bec537b77c064d | |
| parent | 4b8282e50cce1c63afbf7f501de1312a6f283387 (diff) | |
| parent | b336e8c74ef996045694ec9c60054729def721c4 (diff) | |
| download | tor-f249074e419a7f7fe6d0943516cc5d53a88ed435.tar.gz tor-f249074e419a7f7fe6d0943516cc5d53a88ed435.zip | |
Merge remote-tracking branch 'Ryman/bug5605'
| -rw-r--r-- | changes/bug5605 | 2 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/changes/bug5605 b/changes/bug5605 new file mode 100644 index 0000000000..ae66a6e96c --- /dev/null +++ b/changes/bug5605 @@ -0,0 +1,2 @@ +o Minor Bugfixes: + - No longer writing control ports to file if updating reversible options fail. Fixes #5605.
\ No newline at end of file diff --git a/src/or/config.c b/src/or/config.c index 14e8f9ab37..95cede0153 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1129,9 +1129,6 @@ options_act_reversible(const or_options_t *old_options, char **msg) /* No need to roll back, since you can't change the value. */ } - /* Write control ports to disk as appropriate */ - control_ports_write_to_file(); - if (directory_caches_v2_dir_info(options)) { char *fn = NULL; tor_asprintf(&fn, "%s"PATH_SEPARATOR"cached-status", @@ -1330,6 +1327,9 @@ options_act(const or_options_t *old_options) } } + /* Write control ports to disk as appropriate */ + control_ports_write_to_file(); + if (running_tor && !have_lockfile()) { if (try_locking(options, 1) < 0) return -1; |