[tor-commits] [tor/master] Merge branch 'bug22719_031' into maint-0.3.1

[nickm at torproject.org]

commit fd16dd2608ba3a1f97fb13bf7ae3b6640e90376a
Merge: 3259601 50be460
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 10:31:33 2017 -0400

    Merge branch 'bug22719_031' into maint-0.3.1

 changes/bug22719 |  7 +++++++
 src/or/buffers.c | 11 +++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)