[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1

[nickm at torproject.org]

commit 1385a5118d55edd3dd672eeb793b662853f30758
Merge: d6d3f8486 b426e83f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:00:56 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 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(-)