Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2014-04-16 13:32:20 -04:00
commit f050cf75b0

View File

@ -635,10 +635,9 @@ 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
// dannenberg still needs to rotate as of 2014-04-16
"87326329007AF781F587AF5B594E540B2B6C7630", // Expires 2014-07-17 11:10:09
"98CC82342DE8D298CF99D3F1A396475901E0D38E", // Expires 2014-11-10 13:18:56
"9904B52336713A5ADCB13E4FB14DC919E0D45571", // Expires 2014-04-20 20:01:01