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

[dgoulet at torproject.org]

commit 61803775e8b1439b01dbd37ebf4f6105fb19d2f8
Merge: 9a0a91dc23 07f37c64f8
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Jan 20 16:22:36 2021 -0500

    Merge branch 'tor-gitlab/mr/264'

 changes/bug40236 | 2 ++
 configure.ac     | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)