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

[nickm at torproject.org]

commit 4d5b46aad91daeafd9c3f9d703f3b0b7b47ad472
Merge: e79f90c ef4c10f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 27 15:44:31 2017 +0200

    Merge remote-tracking branch 'origin/maint-0.3.0'

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