commit 9390ec043b101b765b505cd920453de58a35a8f1 Merge: 2d26802 68c3df6 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 6 11:34:01 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

src/or/routerkeys.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)