commit 10c33a6af248fa50b42b52fe81b98546a00f442c Merge: 2ab1de9 41ed9e9 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 09:51:48 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug22466_regenerate | 8 ++++++++ src/or/routerkeys.c | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-)