commit 626e6d2c394673ca46a44616a76b33699d0cf763 Merge: 69238ca2d daff9e1ba Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 25 13:33:39 2019 -0500

Merge remote-tracking branch 'tor-github/pr/684'

changes/ticket29059 | 3 +++ src/test/fuzz_static_testcases.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)