commit 17e9d40c16892f7a7c278926dd9f7ba0c175f42a Merge: 95a5186463 9ad525604e Author: David Goulet dgoulet@torproject.org Date: Wed Oct 7 09:00:10 2020 -0400

Merge branch 'tor-gitlab/mr/159'

changes/ticket40138 | 6 ++++++ configure.ac | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 3 deletions(-)