[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9

commit b426e83f077d57e14fc77ebae18a3637bb2c752a Merge: fcd26af7c 8ec6b36dc Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:00:52 2018 -0400

Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9

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