diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-13 09:22:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-13 09:22:34 -0400 |
| commit | 755c88a4746b8b58d1b36486a611abc2d4f44144 (patch) | |
| tree | f957b8e56f600bcc6f5b6929b3d34428119353b1 /.gitignore | |
| parent | 01fc93ffef3843a86710718c12ba9be67dcca2bc (diff) | |
| parent | ea5901bf1c6f201f5618aca21ddbb9c41893f147 (diff) | |
| download | tor-755c88a4746b8b58d1b36486a611abc2d4f44144.tar.gz tor-755c88a4746b8b58d1b36486a611abc2d4f44144.zip | |
Merge branch 'asn/prop224-ntor-v2-squashed'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 3163c12765..f8d6e13da7 100644 --- a/.gitignore +++ b/.gitignore @@ -181,6 +181,7 @@ uptime-*.json /src/test/test-child /src/test/test-memwipe /src/test/test-ntor-cl +/src/test/test-hs-ntor-cl /src/test/test-switch-id /src/test/test-timers /src/test/test_workqueue @@ -189,6 +190,7 @@ uptime-*.json /src/test/test-bt-cl.exe /src/test/test-child.exe /src/test/test-ntor-cl.exe +/src/test/test-hs-ntor-cl.exe /src/test/test-memwipe.exe /src/test/test-switch-id.exe /src/test/test-timers.exe |