commit f96b6ccee1945b2db32c858837ac21c6d81c820b Merge: 6dc9930d3 e61867416 Author: Nick Mathewson nickm@torproject.org Date: Mon May 4 10:25:53 2020 -0400

Merge branch 'maint-0.4.3'

changes/bug34077 | 3 +++ src/feature/dirauth/shared_random_state.c | 3 ++- src/feature/hs/hs_client.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)