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

[nickm at torproject.org]

commit 1b81c4b5f3a3b2ad8a3d3a23a75e5bac08c22a89
Merge: e7463be39 98dff5df3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.4'

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