diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 12:03:41 -0400 |
| commit | 764e0080929fe2e0fc05a226d340a189d264876b (patch) | |
| tree | 21dc878bf63eae8304fc587a166f129201e584f3 /.gitignore | |
| parent | ecab2616413b06754bfb110eab2bfbf58e3a57b2 (diff) | |
| parent | c4337367341f0542a13990c55f0c6cdeca203659 (diff) | |
| download | tor-764e0080929fe2e0fc05a226d340a189d264876b.tar.gz tor-764e0080929fe2e0fc05a226d340a189d264876b.zip | |
Merge branch 'libscrypt_trunnel_squashed'
Conflicts:
src/test/test_crypto.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8bbce20516..744c2b854f 100644 --- a/.gitignore +++ b/.gitignore @@ -174,6 +174,10 @@ cscope.* /src/tools/Makefile /src/tools/Makefile.in +# /src/trunnel/ +/src/trunnel/libor-trunnel-testing.a +/src/trunnel/libor-trunnel.a + # /src/tools/tor-fw-helper/ /src/tools/tor-fw-helper/tor-fw-helper /src/tools/tor-fw-helper/tor-fw-helper.exe |