diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-11 10:24:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-11 10:24:54 -0500 |
| commit | f31b3857febf793a12408dc60cd793fe85778637 (patch) | |
| tree | 63f6b81412c08e2df3fc79863ec7220bb0ea208b /.gitignore | |
| parent | 7892683e7e491c32d1ea3c44d47877fe9ed7c850 (diff) | |
| parent | 114f57b23e0484fa0bac021095dff1d3f5a3c2ae (diff) | |
| download | tor-f31b3857febf793a12408dc60cd793fe85778637.tar.gz tor-f31b3857febf793a12408dc60cd793fe85778637.zip | |
Merge branch 'bug20990_squashed_v2'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e7ef61f355..16c4e40c46 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ uptime-*.json /Makefile /Makefile.in /aclocal.m4 +/ar-lib /autom4te.cache /build-stamp /compile |