[tor-commits] [tor/master] Merge branch 'tls_ecdhe_rebased_v2'

[nickm at torproject.org]

commit 3eb39005106209240832b96e9292385747f703fa
Merge: 747d284 ddbe289
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 25 22:10:57 2012 -0500

    Merge branch 'tls_ecdhe_rebased_v2'

 changes/dh_benchmarks  |    3 +
 changes/tls_ecdhe      |   26 ++++
 doc/tor.1.txt          |    6 +
 src/common/tortls.c    |  339 +++++++++++++++++++++++++++++++++++++++++++-----
 src/common/tortls.h    |    8 +-
 src/or/config.c        |   10 ++
 src/or/connection_or.c |    9 +-
 src/or/or.h            |    2 +
 src/or/router.c        |   13 ++-
 src/test/bench.c       |   99 ++++++++++++++
 10 files changed, 480 insertions(+), 35 deletions(-)