commit 7f91a550342f6a0ee2ceacbe0672eef5b5f93a0c Merge: 4f228f3 88bb48e Author: Roger Dingledine arma@torproject.org Date: Mon Nov 19 16:24:54 2012 -0500

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug7352 | 12 ++++++ changes/bug7464 | 4 ++ 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/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/main.c | 2 +- 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 ++-- 20 files changed, 128 insertions(+), 65 deletions(-)