commit 332865872846c38b518adc4189ca0aa5eaab1378 Merge: 4f169a0 e59f0d4 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 11 08:48:39 2016 -0400 Merge remote-tracking branch 'asn/bug19223' changes/bug19223 | 4 ++++ src/or/routerkeys.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)