[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/193'

[ahf at torproject.org]

commit faa96f9a8eb7e461b8affea04ce3882a2e6e0ddc
Merge: 0702cf10db 486ddde2c4
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Nov 9 14:15:07 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/193'

 changes/ticket40174 |  4 ++++
 configure.ac        | 24 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)