]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'ed25519_ref10_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Sep 2014 19:11:34 +0000 (15:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Sep 2014 19:11:34 +0000 (15:11 -0400)
commit1c5d680b3d6734e989a92deedbcf2bb46f31f7f9
tree9095ef06917bd77ce7581560de56872ef8f8ead7
parent50d15e06b32ce743ac4da532f29abb3781c4b990
parent46cda485bce60894d3128dcd42831a8c6cc7bcb4
Merge branch 'ed25519_ref10_squashed'

Conflicts:
src/common/include.am
src/ext/README
.gitignore
src/common/include.am
src/ext/README
src/test/include.am
src/test/test_crypto.c