diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-16 14:57:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-16 14:57:14 -0400 |
| commit | 3fc0f9efb8b0030bab2574e5998a964adc93ebaa (patch) | |
| tree | 931db05de863e5c727351972bcc3512c54e207cc | |
| parent | f050cf75b0d963be1aa2840bcef60c8b1e96d3b6 (diff) | |
| parent | ef3d7f2f97caf961effd7935dd3231e6bba62ca5 (diff) | |
| download | tor-3fc0f9efb8b0030bab2574e5998a964adc93ebaa.tar.gz tor-3fc0f9efb8b0030bab2574e5998a964adc93ebaa.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
| -rw-r--r-- | src/or/routerlist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e98c5a2925..8fe496b51e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -637,7 +637,6 @@ static const char *BAD_SIGNING_KEYS[] = { "09CD84F751FD6E955E0F8ADB497D5401470D697E", // Expires 2015-01-11 16:26:31 "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 |