commit 14ffcc003d5e8fd383598e34183938fcec51a901 Merge: 5343d2b 4ed0f0d Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 6 09:32:45 2017 -0400

Merge branch 'maint-0.3.0'

src/or/routerkeys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)