[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

[nickm at torproject.org]

commit bd80ba9a9fd8309dc97e812e6e889dc3ad622b86
Merge: 034f51d a7f75b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 11:10:04 2015 -0400

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

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