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

[nickm at torproject.org]

commit d02c5f739ff8c5271fa8e7bf498a13283b5a7be3
Merge: e7b146736 b426e83f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:00:55 2018 -0400

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