commit 1a7419c3df300483f111923daca43febc33b368b Merge: 51e3602 6704e18 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 11:09:30 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

changes/bug15083 | 10 ++++++++++ src/or/buffers.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)