diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 22:52:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 22:52:26 -0400 |
| commit | 8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea (patch) | |
| tree | 27cc90f1ccaa6e60789cd13eaff0022cd5a890bf /src/or | |
| parent | 7206d784dc3def970d5bd8618242f7b9c9c71e37 (diff) | |
| parent | d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 (diff) | |
| download | tor-8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea.tar.gz tor-8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 34208e85bf..9f94ef1af8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4646,7 +4646,7 @@ write_configuration_file(const char *fname, or_options_t *options) switch (file_status(fname)) { case FN_FILE: old_val = read_file_to_str(fname, 0, NULL); - if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) { + if (!old_val || strcmpstart(old_val, GENERATED_FILE_PREFIX)) { rename_old = 1; } tor_free(old_val); |