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

Merge branch 'maint-0.4.5' into release-0.4.5

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