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 | 641dce2d6bfe382411d5897003b18167fdddfc2b (patch) | |
| tree | 5b77fe24e560228e28712fcaf87d01c3d5225efd | |
| parent | c09f8da8a98d035082b207ebdaf1e6fe3110c8b7 (diff) | |
| parent | 65087903d9e55f77a6c0d66517adb605aacab485 (diff) | |
| download | tor-641dce2d6bfe382411d5897003b18167fdddfc2b.tar.gz tor-641dce2d6bfe382411d5897003b18167fdddfc2b.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.3
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index dea131963e..c7ad64d387 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ uptime-*.json # Core files core core.* +!core/ # ccls file that can be per directory. *.ccls |