commit 4b0a0938ce61e572541cbe48a139aee92b86f362 Merge: 37119ef9d 5ab23e03f Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:03:00 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

src/or/dirauth/shared_random_state.c | 1 + src/or/routerlist.c | 2 +- src/test/test_hs.c | 7 +++++-- src/test/test_shared_random.c | 1 + 4 files changed, 8 insertions(+), 3 deletions(-)