[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/311'

[dgoulet at torproject.org]

commit 2709828494b961c92b9389bb2fd934f932fe54bc
Merge: 1b74c49048 aebd0a4080
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 17 13:22:36 2021 -0500

    Merge branch 'tor-gitlab/mr/311'

 changes/bug40298 | 3 +++
 configure.ac     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)