[tor-commits] [tor/master] Allow two ISO times to appear in EntryGuardDownSince.

[nickm at torproject.org]

commit 33df3e37ffecfed309a1a0f210a96620c0ebb837
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 9 08:50:56 2015 -0500

    Allow two ISO times to appear in EntryGuardDownSince.
    
    When I made time parsing more strict, I broke the
    EntryGuardDownSince line, which relied on two concatenated ISO times
    being parsed as a single time.
    
    Fixes bug 14136. Bugfix on 7984fc153112baa5. Bug not in any released
    version of Tor.
---
 src/or/entrynodes.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 9eb0efd..968a993 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1319,7 +1319,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg)
                "EntryGuardDownSince/UnlistedSince without EntryGuard");
         break;
       }
-      if (parse_iso_time(line->value, &when)<0) {
+      if (parse_iso_time_(line->value, &when, 0)<0) {
         *msg = tor_strdup("Unable to parse entry nodes: "
                           "Bad time in EntryGuardDownSince/UnlistedSince");
         break;