diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-08-17 12:00:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-08-17 12:00:44 -0400 |
| commit | 06be6105e45eca8ce3ad24e58652ad3faa083c92 (patch) | |
| tree | 77ccd55de478735e98b7eb6a6dd4603cbb34c89e /src/or/config.c | |
| parent | 14552a12b3b6ff0770153d9d2f116febad349303 (diff) | |
| parent | d79d648edcc19d1f11758016108fdbb57c80b4d0 (diff) | |
| download | tor-06be6105e45eca8ce3ad24e58652ad3faa083c92.tar.gz tor-06be6105e45eca8ce3ad24e58652ad3faa083c92.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/config.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 315884c5b4..716d83ab0d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1120,6 +1120,9 @@ 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)) { size_t len = strlen(options->DataDirectory)+32; char *fn = tor_malloc(len); |