commit 92a42f795ce09f3d846acfb1a70100adbcd32681 Merge: 8da6bfa5d aedcb1644 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 15 20:56:23 2018 -0500 Merge branch 'bug23909' changes/bug23909 | 4 ++++ src/or/keypin.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-)