diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-09 08:50:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-09 08:50:56 -0500 |
| commit | 33df3e37ffecfed309a1a0f210a96620c0ebb837 (patch) | |
| tree | cc58629ee0895a154b7c793aeded404419971fc4 /src/or/entrynodes.c | |
| parent | 6f171003ce8e96e2138825d693e7293fd909956f (diff) | |
| download | tor-33df3e37ffecfed309a1a0f210a96620c0ebb837.tar.gz tor-33df3e37ffecfed309a1a0f210a96620c0ebb837.zip | |
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.
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 9eb0efd670..968a993999 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; |