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

[nickm at torproject.org]

commit 250e0fc1c4b1a4d1fdeb38c43399624996babab9
Merge: 69918629f 6ad2c2b92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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