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

[nickm at torproject.org]

commit 0c0f8ad061812f06c8379ebdb95fd71440fd4eed
Merge: e1718c2 ef4c10f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 27 15:55:32 2017 +0200

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21771    | 5 +++++
 src/or/entrynodes.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)