commit 5f24c7fcac66485b1ccfb65408144774f0c1e96d Merge: a0033c855 56f01e58b Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 27 10:00:01 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)