[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1744'

[teor at torproject.org]

commit 4dd594d33cf9821e1e8c2d9f92f0e0035173bf19
Merge: f0561861e 6e76570ed
Author: teor <teor at torproject.org>
Date:   Wed Feb 19 10:09:29 2020 +1000

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

 Makefile.am         | 181 ++++++++++++++++++++++++++++------------------------
 changes/ticket33334 |   5 ++
 src/test/include.am |  12 ++--
 3 files changed, 108 insertions(+), 90 deletions(-)