diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-17 16:41:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-17 16:41:01 -0500 |
| commit | e969d9c6b4b82178fbc840e3d53e12cbb64fee5c (patch) | |
| tree | 5be34da1967f5358ed84c816c86a4bce7d656a0e /.gitignore | |
| parent | 5a22b42c3a01ad8d99e977cfd9efa760438129e9 (diff) | |
| parent | c8b8b15f0eb2651dea694a057e70e6b8c34dbe05 (diff) | |
| download | tor-e969d9c6b4b82178fbc840e3d53e12cbb64fee5c.tar.gz tor-e969d9c6b4b82178fbc840e3d53e12cbb64fee5c.zip | |
Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index e5d021f30d..b73c5b9ab5 100644 --- a/.gitignore +++ b/.gitignore @@ -241,7 +241,7 @@ uptime-*.json /src/test/test /src/test/test-slow /src/test/test-bt-cl -/src/test/test-child +/src/test/test-process /src/test/test-memwipe /src/test/test-ntor-cl /src/test/test-hs-ntor-cl @@ -251,7 +251,7 @@ uptime-*.json /src/test/test.exe /src/test/test-slow.exe /src/test/test-bt-cl.exe -/src/test/test-child.exe +/src/test/test-process.exe /src/test/test-ntor-cl.exe /src/test/test-hs-ntor-cl.exe /src/test/test-memwipe.exe |