diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-25 15:11:34 -0400 |
| commit | 1c5d680b3d6734e989a92deedbcf2bb46f31f7f9 (patch) | |
| tree | 9095ef06917bd77ce7581560de56872ef8f8ead7 /.gitignore | |
| parent | 50d15e06b32ce743ac4da532f29abb3781c4b990 (diff) | |
| parent | 46cda485bce60894d3128dcd42831a8c6cc7bcb4 (diff) | |
| download | tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.tar.gz tor-1c5d680b3d6734e989a92deedbcf2bb46f31f7f9.zip | |
Merge branch 'ed25519_ref10_squashed'
Conflicts:
src/common/include.am
src/ext/README
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 744c2b854f..9ddd0c5385 100644 --- a/.gitignore +++ b/.gitignore @@ -138,6 +138,10 @@ cscope.* /src/config/torrc.sample /src/config/torrc.minimal +# /src/ext/ +/src/ext/ed25519/ref10/libed25519_ref10.a +/src/ext/ed25519/ref10/libed25519_ref10.lib + # /src/or/ /src/or/Makefile /src/or/Makefile.in |