summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-15 14:04:00 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-15 14:04:00 -0500
commit6ba8afe5f87a1edd16f4c61cbb59a29f9126c6c6 (patch)
treeb8d2a7644c9c0e5599e982fcc38769038defe943 /.gitignore
parenta56fb58d6e1e93b95e2a060b61f3d00eab95a298 (diff)
parent4c1c2a313dcd3638eededd4a1a83ed5f0b8b9fed (diff)
downloadtor-6ba8afe5f87a1edd16f4c61cbb59a29f9126c6c6.tar.gz
tor-6ba8afe5f87a1edd16f4c61cbb59a29f9126c6c6.zip
Merge remote-tracking branch 'teor/feature15775-fallback-v9-squashed'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index dad8be1a48..c71dc026b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,11 @@ cscope.*
# OSX junk
*.dSYM
.DS_Store
+# updateFallbackDirs.py temp files
+details-*.json
+uptime-*.json
+*.full_url
+*.last_modified
# /
/Makefile