[tor-commits] [torspec/master] We mean UTC, not GMT. Fix bug 6113.

[nickm at torproject.org]

commit d581e631e7b89d354789d07c0513b6aef8977a72
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 23 09:57:09 2012 -0500

    We mean UTC, not GMT. Fix bug 6113.
---
 control-spec.txt |   16 ++++++++--------
 dir-spec.txt     |   12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt
index 8a239d0..6819905 100644
--- a/control-spec.txt
+++ b/control-spec.txt
@@ -530,7 +530,7 @@
       via the control interface; the 'all' target returns the mappings
       set through any mechanism.
       Expiry is formatted as with ADDRMAP events, except that "expiry" is
-      always a time in GMT or the string "NEVER"; see section 4.1.7.
+      always a time in UTC or the string "NEVER"; see section 4.1.7.
       First introduced in 0.2.0.3-alpha.
 
     "addr-mappings/*" -- as for address-mappings/*, but without the
@@ -611,7 +611,7 @@
       start and the rest of the interval respectively.  The 'interval-start'
       and 'interval-end' fields are the borders of the current interval; the
       'interval-wake' field is the time within the current interval (if any)
-      where we plan[ned] to start being active. The times are GMT.
+      where we plan[ned] to start being active. The times are UTC.
 
     "config/names"
       A series of lines listing the available configuration options. Each is
@@ -1484,19 +1484,19 @@
 
   Syntax:
      "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry
-       [SP Error] SP GMTExpiry CRLF
+       [SP Error] SP UTCExpiry CRLF
 
      NewAddress = Address / "<error>"
      Expiry = DQUOTE ISOTime DQUOTE / "NEVER"
 
      Error = "error=" ErrorCode
      ErrorCode = XXXX
-     GMTExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE
+     UTCExpiry = "EXPIRES=" DQUOTE IsoTime DQUOTE
 
-  Error and GMTExpiry are only provided if extended events are enabled.
+  Error and UTCExpiry are only provided if extended events are enabled.
 
-  Expiry is expressed as the local time (rather than GMT).  This is a bug,
-  left in for backward compatibility; new code should look at GMTExpiry
+  Expiry is expressed as the local time (rather than UTC).  This is a bug,
+  left in for backward compatibility; new code should look at UTCExpiry
   instead.
 
   These events are generated when a new address mapping is entered in the
@@ -1991,7 +1991,7 @@
   main relays, we might start sending these events in other cases too.
 
   TimeStarted is a quoted string indicating when the reported summary
-  counts from (in GMT).
+  counts from (in UTCS).
 
   The CountrySummary keyword has as its argument a comma-separated,
   possibly empty set of "countrycode=count" pairs. For example (without
diff --git a/dir-spec.txt b/dir-spec.txt
index 39edc0f..e223b2a 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -405,7 +405,7 @@
 
        [Exactly once]
 
-       The time, in GMT, when this descriptor (and its corresponding
+       The time, in UTC, when this descriptor (and its corresponding
        extra-info document if any)  was generated.
 
     "fingerprint" fingerprint NL
@@ -606,7 +606,7 @@
 
        [Exactly once.]
 
-       The time, in GMT, when this document (and its corresponding router
+       The time, in UTC, when this document (and its corresponding router
        descriptor if any) was generated.  It MUST match the published time
        in the corresponding router descriptor.
 
@@ -1010,14 +1010,14 @@
 
         [Exactly once.]
 
-        The time (in GMT) when this document and corresponding key were
+        The time (in UTC) when this document and corresponding key were
         last generated.
 
     "dir-key-expires" YYYY-MM-DD HH:MM:SS NL
 
         [Exactly once.]
 
-        A time (in GMT) after which this key is no longer valid.
+        A time (in UTC) after which this key is no longer valid.
 
     "dir-signing-key" NL a key in PEM format
 
@@ -1373,7 +1373,7 @@
         signed (that is, not including the signature), encoded in base64.
         "Publication" is the
         publication time of its most recent descriptor, in the form
-        YYYY-MM-DD HH:MM:SS, in GMT.  "IP" is its current IP address;
+        YYYY-MM-DD HH:MM:SS, in UTC.  "IP" is its current IP address;
         ORPort is its current OR port, "DirPort" is its current directory
         port, or "0" for "none".
 
@@ -2213,7 +2213,7 @@
    Authorities MUST take pains to ensure that their clocks remain accurate
    within a few seconds.  (Running NTP is usually sufficient.)
 
-   The first voting period of each day begins at 00:00 (midnight) GMT.  If
+   The first voting period of each day begins at 00:00 (midnight) UTC.  If
    the last period of the day would be truncated by one-half or more, it is
    merged with the second-to-last period.