commit 34aefe6f38716ad88f07aa479f09008ed9d179b2 Merge: 810ef71 835e09e Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 14 08:40:51 2015 -0400 Merge remote-tracking branch 'public/decouple_init_keys' changes/decouple_init_keys | 3 ++ src/or/main.c | 2 +- src/or/router.c | 68 ++++++++++++++++++++++++++++---------------- src/or/router.h | 1 + 4 files changed, 48 insertions(+), 26 deletions(-)