commit 5ba521297f78072dd7a655935f17d114fc89c7a3 Merge: 05ee5b983c 8500700aa4 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 16:06:54 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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