commit 2a3cf374508f48adc45b6cc6825dd341a71f5a0b Merge: d54cd853ad c09f8da8a9 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 16:06:54 2021 -0500

Merge branch 'maint-0.4.3' into maint-0.4.4

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