commit a7f75b2056b8bdf59d064268c53a10ac46972380 Merge: de2c5ad 1a7419c Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 9 11:09:49 2015 -0400

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

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