diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
| commit | ed87738ede789fb9eccfd2e5a34bd8c484dfe44e (patch) | |
| tree | 27eb5efade75d368692a80d258615415deb8a7dc /src/or/config.c | |
| parent | b27f5cc50d4a66bff31e43a596eb296a1b5a11dc (diff) | |
| parent | 50b06a2b76190170e9f80739f022696755b54b99 (diff) | |
| download | tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.tar.gz tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/config.c
src/or/networkstatus.c
src/or/rendcommon.c
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index a27fd22b24..b124db1899 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5182,8 +5182,8 @@ or_state_save(time_t now) tor_free(state); fname = get_datadir_fname("state"); if (write_str_to_file(fname, contents, 0)<0) { - log_warn(LD_FS, "Unable to write state to file \"%s\"; will try later", - fname); + log_warn(LD_FS, "Unable to write state to file \"%s\"; " + "will try again later", fname); global_state->LastWritten = -1; tor_free(fname); tor_free(contents); |