commit 761eb4cf79d24a7971be9c1b4f6c969a5db28fab Merge: ef12ab83c 56f01e58b Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 27 09:59:42 2019 -0500

Merge branch 'maint-0.4.0'

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