[tor-commits] [tor/master] Merge remote-tracking branch 'majek/bug5170'

[nickm at torproject.org]

commit aaaf082ed69d2fa75c8a2f79f42a67ee18ee3865
Merge: c300720 d769cd8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 13:47:57 2013 -0400

    Merge remote-tracking branch 'majek/bug5170'

 changes/bug5170        |    5 ++++
 contrib/id_to_fp.c     |   77 ------------------------------------------------
 src/common/crypto.c    |   66 ++++++++++++++---------------------------
 src/common/tortls.c    |   48 +++++++++++++++---------------
 src/common/tortls.h    |    5 ++++
 src/test/include.am    |    1 +
 src/test/test.c        |    2 ++
 src/test/test_crypto.c |   34 +++++++++++++++++++++
 src/test/test_data.c   |    5 ++++
 src/test/test_tortls.c |   45 ++++++++++++++++++++++++++++
 10 files changed, 142 insertions(+), 146 deletions(-)