commit e166b66ec025e0d0d0ca19c08844912229e28b69 Merge: d851f0759 9f3f99938 Author: teor teor@torproject.org Date: Wed Apr 10 18:27:03 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug29922 | 4 ++++ src/test/test_util.c | 2 ++ 2 files changed, 6 insertions(+)