commit 5110b15cee4de3d05ee840d3d4b891a88d389333 Merge: a221f11483 2a3cf37450 Author: David Goulet <dgoulet@torproject.org> Date: Thu Jan 21 16:06:54 2021 -0500 Merge branch 'maint-0.4.4' into release-0.4.4 .gitignore | 3 +++ Makefile.am | 14 ++++++++++++++ changes/ticket40227 | 4 ++++ scripts/maint/gen_ccls_file.sh | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+)