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

[nickm at torproject.org]

commit fecad31f10271b1578d95fd87580898ee492d247
Merge: 72b802001 471e0096a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 14 10:15:38 2017 -0400

    Merge branch 'maint-0.3.1'

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