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

[nickm at torproject.org]

commit 61f3fe041835adc88ac34d5ca974dd12162fb31f
Merge: fdcb065bf a971018f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 10:15:38 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 src/or/entrynodes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)