diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 22:55:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 22:55:29 -0400 |
| commit | 7649adbce60c7ab615e233f9e9ce41c22df8134c (patch) | |
| tree | eec3b068a431d1f976d49f04ef1f6f69cecd6be9 /src/or | |
| parent | 6d5478a8a7734553fc84574e725625610f46dc8c (diff) | |
| parent | 8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea (diff) | |
| download | tor-7649adbce60c7ab615e233f9e9ce41c22df8134c.tar.gz tor-7649adbce60c7ab615e233f9e9ce41c22df8134c.zip | |
Merge remote-tracking branch 'origin/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 5b251d382a..d17ed2462c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4764,7 +4764,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); |