commit 66bbdadbbe452a3f2d3d266a0951c15fbef6589b Merge: 626eb025b 1d068625d Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 20 10:41:12 2020 -0500

Merge branch 'extract_routerkeys_squashed'

scripts/maint/practracker/exceptions.txt | 4 +- src/core/or/channeltls.c | 1 + src/core/or/connection_or.c | 534 +---------------------------- src/core/or/connection_or.h | 14 - src/feature/relay/include.am | 6 +- src/feature/relay/relay_handshake.c | 565 +++++++++++++++++++++++++++++++ src/feature/relay/relay_handshake.h | 90 +++++ src/feature/relay/routerkeys.h | 82 +++++ src/test/test_link_handshake.c | 1 + 9 files changed, 746 insertions(+), 551 deletions(-)