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

[teor at torproject.org]

commit 3669a2f827ce5fcfbaad693565069bbcab4e6276
Merge: c7baacf4c 031f204a1
Author: teor <teor at torproject.org>
Date:   Tue Nov 26 11:30:49 2019 +1000

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

 changes/ticket32608 |  4 ++++
 configure.ac        | 15 ++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)