Commit f249074e authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'Ryman/bug5605'

parents 4b8282e5 b336e8c7

changes/bug5605

0 → 100644
+2 −0
Changes for changes/bug5605: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line 
o Minor Bugfixes:

    - No longer writing control ports to file if updating reversible options fail. Fixes #5605.
 
 No newline at end of file

src/or/config.c

+3 −3
Changes for src/or/config.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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;