commit b178a8adeef7d655a90e7b613b4b9387d04dfb74 Merge: cd1468d56b e5a0c739d4 Author: David Goulet dgoulet@torproject.org Date: Wed Jan 13 10:38:23 2021 -0500

Merge branch 'maint-0.4.5'

Signed-off-by: David Goulet dgoulet@torproject.org

.gitignore | 3 +++ 1 file changed, 3 insertions(+)

diff --cc .gitignore index 06575f6351,08efd8ed04..b60d23b917 --- a/.gitignore +++ b/.gitignore @@@ -37,8 -37,9 +37,11 @@@ details-*.jso uptime-*.json *.full_url *.last_modified +# ccls file that can be per directory. +*.ccls + # Core files + core + core.*

# / /Makefile