Commit a5851939 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

i heard that users know the phrase 'system clock' better than 'clock'. hm. 


svn:r11820
parent c03d0f9e

src/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ void 
circuit_note_clock_jumped(int seconds_elapsed)

{

  int severity = server_mode(get_options()) ? LOG_WARN : LOG_NOTICE;

  log(severity, LD_GENERAL, "Your clock just jumped %d seconds %s; "

  log(severity, LD_GENERAL, "Your system clock just jumped %d seconds %s; "

      "assuming established circuits no longer work.",

      seconds_elapsed >=0 ? seconds_elapsed : -seconds_elapsed,

      seconds_elapsed >=0 ? "forward" : "backward");

src/or/networkstatus.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ _compare_networkstatus_published_on(const void **_a, const void **_b) 
}



/** Add the parsed neworkstatus in <b>ns</b> (with original document in

 * <b>s</b> to the disk cache (and the in-memory directory server cache) as

 * <b>s</b>) to the disk cache (and the in-memory directory server cache) as

 * appropriate. */

static int

add_networkstatus_to_cache(const char *s,
@@ -308,7 +308,7 @@ router_set_networkstatus(const char *s, time_t arrived_at, 


  if (ns->published_on > now + NETWORKSTATUS_ALLOW_SKEW) {

    log_warn(LD_GENERAL, "Network status from %s was published in the future "

             "(%s GMT). Somebody is skewed here: check your clock. "

             "(%s GMT). Check your system clock! "

             "Not caching.",

             source_desc, published);

    control_event_general_status(LOG_WARN,