diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-12-14 23:39:14 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-12-14 23:39:14 +0000 |
| commit | c44dd3870e4fa46ad983632b873bcf7e4f973ff8 (patch) | |
| tree | 26ca511a3765ec978e297077a3e82dac93bba1be | |
| parent | 30e4f4f6ce17dfe8e0a44a45c0fecda689ece475 (diff) | |
| download | tor-c44dd3870e4fa46ad983632b873bcf7e4f973ff8.tar tor-c44dd3870e4fa46ad983632b873bcf7e4f973ff8.tar.gz | |
clarify our use of local time vs GMT
svn:r9109
| -rw-r--r-- | doc/control-spec.txt | 2 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/config.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/control-spec.txt b/doc/control-spec.txt index ffe862c78..08e91cfb9 100644 --- a/doc/control-spec.txt +++ b/doc/control-spec.txt @@ -930,6 +930,8 @@ $Id$ "650" SP "ADDRMAP" SP Address SP Address SP Expiry Expiry = DQOUTE ISOTime DQUOTE / "NEVER" + Expiry is expressed as the local time (rather than GMT). + [XXX We should rename this to ADDRESSMAP. -RD] [FFF We should add a SOURCE=%s argument for extended events, diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index dbfa95e8e..c76667a2b 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2006,7 +2006,7 @@ remove_dead_entries(void) base16_encode(dbuf, sizeof(dbuf), entry->identity, DIGEST_LEN); format_local_iso_time(tbuf, entry->bad_since); log_info(LD_CIRC, "Entry guard '%s' (%s) has been down or unlisted " - "since %s; removing.", + "since %s local time; removing.", entry->nickname, dbuf, tbuf); tor_free(entry); smartlist_del_keeporder(entry_guards, i); diff --git a/src/or/config.c b/src/or/config.c index cc78bcb00..2afabe480 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3974,11 +3974,12 @@ or_state_save(time_t now) tor_free(global_state->TorVersion); global_state->TorVersion = tor_strdup("Tor " VERSION); state = config_dump(&state_format, global_state, 1); - len = strlen(state)+128; + len = strlen(state)+256; contents = tor_malloc(len); format_local_iso_time(tbuf, time(NULL)); tor_snprintf(contents, len, - "# Tor state file last generated on %s\n" + "# Tor state file last generated on %s local time\n" + "# Other times below are in GMT\n" "# You *do not* need to edit this file.\n\n%s", tbuf, state); tor_free(state); |