[tor-commits] [tor/master] Merge branch 'bug7352_023_rebased' into maint-0.2.3

[nickm at torproject.org]

commit 9ad4776e6150a29fdfff607721599eb04c6e76d7
Merge: 758428d 49dd5ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 8 16:45:46 2012 -0500

    Merge branch 'bug7352_023_rebased' into maint-0.2.3

 changes/bug7352          |   12 ++++++
 src/common/aes.c         |    4 +-
 src/common/compat.c      |    2 +-
 src/common/crypto.c      |   89 ++++++++++++++++++++++++++++++++++------------
 src/common/crypto.h      |    3 ++
 src/common/mempool.c     |    3 +-
 src/common/tortls.c      |    4 +-
 src/common/util.c        |    2 +-
 src/or/buffers.c         |    6 ++--
 src/or/circuitlist.c     |    8 ++--
 src/or/connection.c      |    2 +-
 src/or/connection_edge.c |    4 +-
 src/or/connection_or.c   |    8 ++--
 src/or/networkstatus.c   |    2 +-
 src/or/onion.c           |   24 ++++++------
 src/or/rendclient.c      |    4 +-
 src/or/rendservice.c     |    4 +-
 src/or/routerparse.c     |    2 +-
 src/tools/tor-gencert.c  |    6 ++--
 19 files changed, 124 insertions(+), 65 deletions(-)