commit f8cf2546ea6731d6fdca6a7cfc52d047bc47bb8b Merge: e5a0c739d4 8230d2ba3b Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 11:59:58 2021 -0500

Merge remote-tracking branch 'tor-gitlab/mr/258' into maint-0.4.5

acinclude.m4 | 4 ++-- changes/ticket33624 | 5 +++++ configure.ac | 10 +++++++++- 3 files changed, 16 insertions(+), 3 deletions(-)