commit 6bef082d0a6047fd3625f548d60ad257aaed2fab Merge: c0441cc 61090bb Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 1 09:39:48 2014 -0400

Merge remote-tracking branch 'public/bug11232'

changes/bug11232 | 4 ++++ src/common/address.c | 2 +- src/common/compat.h | 2 +- src/common/memarea.c | 43 +++++++++++++++++++++++++++---------------- src/ext/csiphash.c | 5 +++++ src/test/test_circuitlist.c | 6 +++--- 6 files changed, 41 insertions(+), 21 deletions(-)