commit 2d26802524135a21df8494694005e759baa66a1e Merge: 624bccc 4ed0f0d Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 6 09:32:37 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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