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

[nickm at torproject.org]

commit 7d3883d0846a254b755316d4ca1f0f3b8250b8c9
Merge: a0a4f8a 5298ab5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 15:11:23 2017 -0500

    Merge branch 'maint-0.3.0'

 src/or/entrynodes.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)