diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-18 11:00:16 -0500 |
| commit | fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4 (patch) | |
| tree | 0d0f0b0aa37423e8f36f11e8410849e48be59ba6 /.gitignore | |
| parent | 7a2b30fe16eacc040b3dd11f8c39c410628c2f43 (diff) | |
| parent | c81f64ab44f71a97649a44e10d6fcbf15aa8c835 (diff) | |
| download | tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.tar.gz tor-fbc20294aaf67f9434d5b1e107b8e1c43e42a3a4.zip | |
Merge branch 'backtrace_squashed'
Conflicts:
src/common/sandbox.c
src/common/sandbox.h
src/common/util.c
src/or/main.c
src/test/include.am
src/test/test.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 65f4d3f390..35a6c00106 100644 --- a/.gitignore +++ b/.gitignore @@ -162,9 +162,11 @@ /src/test/bench /src/test/bench.exe /src/test/test +/src/test/test-bt-cl /src/test/test-child /src/test/test-ntor-cl /src/test/test.exe +/src/test/test-bt-cl.exe /src/test/test-child.exe /src/test/test-ntor-cl.exe |