[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit e3b1573be6aefc91946fa4649591ed1690d77ee8
Merge: dd573f7 91f49bc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 15:52:06 2017 -0400

    Merge branch 'maint-0.3.0'

 changes/bug22460_case1         | 16 +++++++++++++
 changes/bug22460_case2         |  8 +++++++
 src/common/tortls.c            | 27 +++++++++++++++++++---
 src/common/tortls.h            |  1 +
 src/or/connection_or.c         | 51 ++++++++++++++++++++++++++++--------------
 src/or/connection_or.h         |  4 ++++
 src/or/main.c                  | 17 +++++++++-----
 src/or/or.h                    |  6 +++++
 src/or/router.c                |  5 +++--
 src/or/routerkeys.c            | 37 +++++++++++++++++++++++++-----
 src/or/routerkeys.h            |  2 +-
 src/test/test_link_handshake.c | 39 +++++++++++++++++++++++++++++++-
 src/test/test_routerkeys.c     | 20 ++++++++---------
 src/test/test_shared_random.c  |  4 ++--
 14 files changed, 190 insertions(+), 47 deletions(-)

diff --cc src/or/routerkeys.c
index c8d5f70,1eb44db..5ab369b
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@@ -685,11 -688,8 +688,12 @@@ load_ed_keys(const or_options_t *option
    const tor_cert_t *check_signing_cert = NULL;
    tor_cert_t *sign_cert = NULL;
    tor_cert_t *auth_cert = NULL;
+   int signing_key_changed = 0;
  
 +  // It is later than 1972, since otherwise there would be no C compilers.
 +  // (Try to diagnose #22466.)
 +  tor_assert_nonfatal(now >= 2 * 365 * 86400);
 +
  #define FAIL(msg) do {                          \
      log_warn(LD_OR, (msg));                     \
      goto err;                                   \