[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3

[dgoulet at torproject.org]

commit c09f8da8a98d035082b207ebdaf1e6fe3110c8b7
Merge: 9b390a556e 8500700aa4
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jan 21 16:06:54 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3

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