Merge branch 'bug34077_042' into bug34077_043

author Nick Mathewson <nickm@torproject.org>

Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)

committer Nick Mathewson <nickm@torproject.org>

Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)
author Nick Mathewson <nickm@torproject.org>
Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)
committer Nick Mathewson <nickm@torproject.org>
Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)
diff --cc src/feature/dirauth/shared_random_state.c
Simple merge
author	Nick Mathewson <nickm@torproject.org>
	Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 1 May 2020 03:01:58 +0000 (23:01 -0400)