commit ab75eef8dda56523ac2ada0602395e2635b51b61 Merge: 1cd6baad7e c09f8da8a9 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 16:06:54 2021 -0500

Merge branch 'maint-0.4.3' into release-0.4.3

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