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

[nickm at torproject.org]

commit 059f638a121031386a380b1ea416b65142e9aafb
Merge: 4e4d2ed86 250e0fc1c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_entrynodes.c | 6 ++++++
 1 file changed, 6 insertions(+)