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

[nickm at torproject.org]

commit 67af36397d3685100ed905c8581baaca4d12e193
Merge: bc9bc9304 6ad2c2b92
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:20 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

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