diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:52:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:52:41 -0500 |
| commit | b1bdecd703879ca09bf63bf1453a70c4b80ac96d (patch) | |
| tree | 9fd512361cae60d0aec849e52e349cc1a67f8055 /.gitignore | |
| parent | ee4182612f7f06ae09531bf75e9b84ea30871278 (diff) | |
| parent | d3de0b91fb322c00d11857d89a8420af0d466e39 (diff) | |
| download | tor-b1bdecd703879ca09bf63bf1453a70c4b80ac96d.tar tor-b1bdecd703879ca09bf63bf1453a70c4b80ac96d.tar.gz | |
Merge branch 'ntor-resquashed'
Conflicts:
src/or/cpuworker.c
src/or/or.h
src/test/bench.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8034ae661..f25323e77 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,8 @@ .dirstamp # Stuff made by our makefiles *.bak +# Python droppings +*.pyc # / /Makefile @@ -130,6 +132,8 @@ /src/common/libor-crypto.lib /src/common/libor-event.a /src/common/libor-event.lib +/src/common/libcurve25519_donna.a +/src/common/libcurve25519_donna.lib # /src/config/ /src/config/Makefile @@ -154,9 +158,10 @@ /src/test/bench.exe /src/test/test /src/test/test-child +/src/test/test-ntor-cl /src/test/test.exe /src/test/test-child.exe - +/src/test/test-ntor-cl.exe # /src/tools/ /src/tools/tor-checkkey |