[tor-commits] [tor/master] Merge branch 'tor-github/pr/1088'

[asn at torproject.org]

commit 96fade0a7d258a37dab0ced996a180a2722244c7
Merge: 7b3efc386 c46e99c43
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jun 12 13:01:53 2019 +0300

    Merge branch 'tor-github/pr/1088'

 changes/bug30804     | 4 ++++
 src/test/test_util.c | 5 +++++
 2 files changed, 9 insertions(+)