commit 41891cbf93c32282ed6136d29375b5863efcf727 Merge: 901732a 037e876 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 10 10:37:13 2015 -0400

Merge remote-tracking branch 'public/ed25519_hup_v2'

changes/ed25519_hup | 4 ++++ src/or/main.c | 8 ++++++++ src/or/routerkeys.c | 16 ++++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-)