[tor-commits] [tor/maint-0.3.2] Merge branch 'trove-2017-012_030' into maint-0.3.0

[nickm at torproject.org]

commit d459c08b7d5cb1766bda5443ea2750bca160212d
Merge: 766d0a2d9 91cee3c9e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:07:43 2017 -0500

    Merge branch 'trove-2017-012_030' into maint-0.3.0

 changes/trove-2017-012-part2 | 5 +++++
 src/or/entrynodes.c          | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)