commit 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec Merge: 5c45a33 fd28754 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 12 12:39:15 2014 -0500

Merge remote-tracking branch 'public/bug10169_023' into bug10169_024

src/or/buffers.c | 18 +++++++++++++----- src/or/buffers.h | 2 +- src/or/circuitlist.c | 13 +++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-)