commit 0793ef862b4991281bcb9155f0d15a3930889bea Merge: 682c154 909aa51 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 27 12:12:16 2014 -0400 Merge remote-tracking branch 'sebastian/bug13286' changes/bug13286 | 2 + configure.ac | 170 +++++++++++++++++++--------------------- src/common/crypto_curve25519.h | 2 - src/common/crypto_ed25519.h | 3 - src/common/include.am | 11 +-- src/or/circuitbuild.c | 20 ----- src/or/include.am | 8 +- src/or/onion.c | 22 ------ src/or/onion.h | 2 - src/or/onion_ntor.h | 3 - src/or/or.h | 2 - src/or/router.c | 22 ------ src/or/router.h | 2 - src/test/bench.c | 7 +- src/test/include.am | 6 -- src/test/test.c | 6 -- src/test/test_cell_formats.c | 8 -- src/test/test_crypto.c | 6 -- src/test/test_dir.c | 4 - src/test/test_ntor_cl.c | 4 - src/win32/orconfig.h | 1 - 21 files changed, 86 insertions(+), 225 deletions(-)