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

[nickm at torproject.org]

commit 35423d397f9d4f7810e538b608ded47c33311026
Merge: b3a6907 1ad6dd0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 15:59:10 2014 -0500

    Merge branch 'bug4900_siphash_v2'

 LICENSE                |   23 ++++++++
 changes/feature4900    |   12 ++++
 src/common/address.c   |   38 +++++++++---
 src/common/address.h   |    3 +-
 src/common/container.c |   10 +---
 src/common/container.h |   21 +++----
 src/common/crypto.c    |   70 ++++++++++++++++++----
 src/common/crypto.h    |    2 +
 src/common/include.am  |    1 +
 src/ext/csiphash.c     |  153 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/ext/ht.h           |    2 +
 src/ext/include.am     |    3 +-
 src/ext/siphash.h      |   13 ++++
 src/or/channel.c       |    7 +--
 src/or/dns.c           |    2 +-
 src/or/fp_pair.c       |   13 +---
 src/or/geoip.c         |    8 ++-
 src/or/main.c          |    7 +++
 src/or/microdesc.c     |    7 +--
 src/or/nodelist.c      |    9 +--
 src/or/policies.c      |   30 ++++++----
 src/test/bench.c       |    1 +
 src/test/test_crypto.c |   98 +++++++++++++++++++++++++++++++
 23 files changed, 448 insertions(+), 85 deletions(-)