diff options
author | David Goulet <dgoulet@torproject.org> | 2021-01-21 16:18:43 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-01-21 16:18:43 -0500 |
commit | 1f7876ff7eff328fd4850ea1ef9ade81ac9c676e (patch) | |
tree | 5f345740fd9c64ddbc08afbfaf3c4ddcd0cfb146 | |
parent | e07d62f5c39794949ae47835da145517d9b76d35 (diff) | |
parent | 68d1e02c3a7594dc3f293edfe69ce49eb856d3ce (diff) | |
download | tor-1f7876ff7eff328fd4850ea1ef9ade81ac9c676e.tar.gz tor-1f7876ff7eff328fd4850ea1ef9ade81ac9c676e.zip |
Merge branch 'maint-0.4.5' into release-0.4.5
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 61135655eb..19a82fb4b6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ uptime-*.json # Core files core core.* +!core/ # ccls file that can be per directory. *.ccls |