commit 22e72eeaa78e84ca5b839690628de0db0c287d58 Merge: 15900ab70 4b79b43e3 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 22 11:17:10 2019 -0400

Merge branch 'maint-0.4.0'

changes/bug29693 | 3 +++ src/test/test_prob_distr.c | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-)