[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 50cc49dd7f0929ece6dc116671790ad94ee6baba
Merge: 4da0fe0 4c21d4e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 14:03:23 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21507     | 5 +++++
 src/or/routerparse.c | 2 ++
 2 files changed, 7 insertions(+)