commit e07d62f5c39794949ae47835da145517d9b76d35 Merge: 2fa5b8286f e06a0e904c Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 16:07:46 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

.gitignore | 3 +++ Makefile.am | 14 ++++++++++++++ changes/ticket40227 | 4 ++++ scripts/maint/gen_ccls_file.sh | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+)