[tor-commits] [tor/master] Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2

[nickm at torproject.org]

commit 6ad2c2b92f275cbdf2911f03ffbd1ac708ec6fcc
Merge: 4a604d993 ce692332b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 10:17:17 2018 -0400

    Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2

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