aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-12-21 11:30:58 -0500
committerNick Mathewson <nickm@torproject.org>2018-12-21 11:30:58 -0500
commit9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59 (patch)
tree8869e4f87ce434c8928503be9997c776ffdeb3d4 /.gitignore
parente4109020e9b423a170e7ca14d04727bc3730dc67 (diff)
parent97c9ced70ac364f7067fc088b90184ab77c9ecd9 (diff)
downloadtor-9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59.tar.gz
tor-9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b73c5b9ab5..6a49285b8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,9 +72,12 @@ uptime-*.json
/mkinstalldirs
/Tor*Bundle.dmg
/tor-*-win32.exe
+/warning_flags
+
/coverage_html/
/callgraph/
+
# /contrib/
/contrib/dist/tor.sh
/contrib/dist/torctl