diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-16 15:37:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-16 15:37:19 -0400 |
| commit | 438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6 (patch) | |
| tree | b49d3531453b17bd77a6e47775c64c214245748e /src/or | |
| parent | 125c8e54680c936b9e532597372c62ac47af4fa9 (diff) | |
| parent | 3fc0f9efb8b0030bab2574e5998a964adc93ebaa (diff) | |
| download | tor-438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6.tar tor-438a03ef7c1aec6a9a92a74dafe127fa3f52a4e6.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/routerlist.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f0197357e..c15274e99 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -624,10 +624,8 @@ authority_cert_dl_failed(const char *id_digest, static const char *BAD_SIGNING_KEYS[] = { "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31 -// dizum still needs to rotate as of 2014-04-14 -//"0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 -// dannenberg still needs to rotate as of 2014-04-14 -//"57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 + "0E7E9C07F0969D0468AD741E172A6109DC289F3C", // Expires 2014-08-12 10:18:26 + "57B85409891D3FB32137F642FDEDF8B7F8CDFDCD", // Expires 2015-02-11 17:19:09 "87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09 "98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56 "9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01 |