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