Merge remote-tracking branch 'sebastian/bug13286'

changes/bug13286

configure.ac

src/common/crypto_curve25519.h

src/common/crypto_ed25519.h

src/common/include.am

src/or/circuitbuild.c

src/or/include.am

src/or/onion.c

src/or/onion.h

src/or/onion_ntor.h

src/or/or.h

src/or/router.c

src/or/router.h

src/test/bench.c

src/test/include.am

src/test/test.c

src/test/test_cell_formats.c

src/test/test_crypto.c

src/test/test_dir.c

src/test/test_ntor_cl.c