commit 85c4087de9b80c2174e47359a5a97f5fac5c0c10 Merge: aa0c4fd86d f8cf2546ea Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 12:00:06 2021 -0500

Merge branch 'maint-0.4.5'

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