[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit be741d7e63b06fe103caab3db4b64ada45bd6bae
Merge: 1763aa0 41ed9e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 09:51:57 2017 -0400

    Merge branch 'maint-0.3.0'

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