commit 0f85e059b7e90cdfdb9b130b811e552107fdee38 Merge: 63cddead3 df896ed63 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:00:56 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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