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

[nickm at torproject.org]

commit b2bb41e029f16e7d8c67415d60e21826bd9959eb
Merge: aec522661 fe2588a5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:00:56 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/routerlist.c           | 2 ++
 src/or/shared_random_state.c  | 1 +
 src/test/test_hs.c            | 7 +++++--
 src/test/test_shared_random.c | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)