[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[nickm at torproject.org]

commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea
Merge: 2bcb596 addffcc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 11:08:57 2015 -0400

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

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