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

[nickm at torproject.org]

commit fe2588a5a8560c8cb03345b3caaaf906655c34a1
Merge: 25226fb26 1385a5118
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:00:56 2018 -0400

    Merge branch 'maint-0.3.1' into maint-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(-)