commit 9ab45d621cc2b973bdfca99a69c0db2901d0e950 Merge: 14ffcc0 68c3df6 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jun 6 11:34:11 2017 -0400 Merge branch 'maint-0.3.0' src/or/routerkeys.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)