[tor-commits] [tor/master] Merge branch 'finish_prop157'

[nickm at torproject.org]

commit a7c9d64fd683beeb2e88445399375cac2bee9495
Merge: 3cdd796 ec9d88e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 18 13:27:06 2013 -0500

    Merge branch 'finish_prop157'

 changes/prop157-require |    5 ++
 src/or/or.h             |    3 -
 src/or/routerparse.c    |   23 +++---
 src/test/test_data.c    |  181 ++++++++++++++++++++++++++---------------------
 src/test/test_dir.c     |    1 -
 5 files changed, 115 insertions(+), 98 deletions(-)

diff --cc src/test/test_data.c
index 3c68b12,71f001d..9aef106
--- a/src/test/test_data.c
+++ b/src/test/test_data.c
@@@ -63,28 -73,23 +73,28 @@@ const char AUTHORITY_SIGNKEY_A[] 
  "Yx4lqK0ca5IkTp3HevwnlWaJgbaOTUspCVshzJBhDA==\n"
  "-----END RSA PRIVATE KEY-----\n";
  
 +const char AUTHORITY_SIGNKEY_1_DIGEST[] =
 +  "CBF56A83368A5150F1A9AAADAFB4D77F8C4170E2";
 +const char AUTHORITY_SIGNKEY_1_DIGEST256[] =
 +  "AF7C5468DBE3BA54A052726038D7F15F3C4CA511B1952645B3D96D83A8DFB51C";
 +
  /** Second of 3 example authority certificates for unit testing. */
- const char AUTHORITY_CERT_2[] =
+ const char AUTHORITY_CERT_B[] =
  "dir-key-certificate-version 3\n"
- "fingerprint 4D44AE0470B9E88FD4558EFEC82698FB33715400\n"
- "dir-key-published 2007-06-13 16:52:32\n"
- "dir-key-expires 2008-06-13 16:52:32\n"
+ "fingerprint AD011E25302925A9D39A80E0E32576442E956467\n"
+ "dir-key-published 2013-11-14 14:12:05\n"
+ "dir-key-expires 2014-11-14 14:12:05\n"
  "dir-identity-key\n"
  "-----BEGIN RSA PUBLIC KEY-----\n"
- "MIIBigKCAYEAqukDwQRm1Oy1pPY+7GNRnRNFJzEVPUBfJwC4tBH19tkvdRQPuIGI\n"
- "2jiTy/rmZ6CLcl1G0oulSgxfKEX75QdptOasZu+rKUrRRSxx0QrXhs9a7up0rpXh\n"
- "13fw3mh1Vl/As3rJYF30Hjk01BTOJMxi/HY2y0ALQytFWjiMGY74A9Y6+uDcHkB2\n"
- "KflBjxIl8zpCsXsTTnUhN5kXqaOOnK46XaUShSpXsyOxTMJXuJEtgLz9XCyA8XjW\n"
- "d75QLHucEnlTqxUAdI5YSN2KIlIJiySCVnAorDpJey2mE9VncpHQWMCv/FPFdnSU\n"
- "EMMPUc4bBShcoNFf0mMJeV2sv+dBkgKAL0GLM19PuJIThJhfN/B6+YQTxw4HEpPV\n"
- "plfUqYRN0fYC+5hCTS6rroO/uCfDR7NBtoeDNm9dQrvjfk3b/Mywah1rdWNjnVqs\n"
- "tPJaz3fc/CVBOUUexhmyktgLuwSNEYIQilQ+BydkWN/4RObhV+YSV5BgekEDVaoS\n"
- "RHw4IbYBDHVxAgMBAAE=\n"
+ "MIIBigKCAYEAyXYEMlGNRAixXdg65xf2WPkskYj2Wo8ysKMTls1JCXdIOAPvC2k2\n"
+ "+AC6i3x9JHzUgCjWr4Jd5PSi7ODGyFC543igYl4wzkxNTU2L+SQ+hMe9qbEuUNhH\n"
+ "sRR0xofdoH//3UuKj+HXEiMhhHbRWQGtWFuJqtGBruJqjZqIGOrp5nFjdlP0R98n\n"
+ "Rx5wWlPgdJzifkXjKouu4mV+KzLl7f0gAtngA9DkSjt1wzga5IlL/lxDciD0SyJU\n"
+ "tKMmls056omrZNbTnBxnY2pOlq9nx/zFrt/KQm1fTAQMjMBCf9KnDIV7NhaaHx7F\n"
+ "7Nk8L7Hha353SvR+bsOFpiu05/EMZFTTIhO3MhUxZiCVZ0hKXvW1xe0HoGC5wbB+\n"
+ "NyXu8oa4fIKLJ+WJ8Z60BNc0DcxJiQOf1eolGM/qrBul1lFZznds5/7182d+nF2W\n"
+ "+bEjSm0fgXIxPfSD/7hB0FvgtmB3TXybHGBfPZgX0sTzFB6LNtP0BHicRoMXKdLF\n"
+ "hM3tgIjEAsoZAgMBAAE=\n"
  "-----END RSA PUBLIC KEY-----\n"
  "dir-signing-key\n"
  "-----BEGIN RSA PUBLIC KEY-----\n"