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

[nickm at torproject.org]

commit 471e0096ad832ac8d6840254892bde96ea38df45
Merge: 6fc47062a a971018f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 10:15:38 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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