commit c1ab53847907166cdc93727cee5877c68e8bdd01 Merge: ecbc2e80a fe3dfe7e3 Author: teor teor@torproject.org Date: Fri Mar 1 14:14:51 2019 +1000

Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9

changes/bug25113 | 5 +++++ src/test/test_util.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)