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

[nickm at torproject.org]

commit 27e2b0a685de9d0abdc0acf15b71a8bab3dbd2e5
Merge: 84800f5a8 98dff5df3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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