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

[nickm at torproject.org]

commit 22f441d4ee40a6d1c9615aeb2b08b872549abfd0
Merge: f6df433 fd16dd2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 27 10:32:50 2017 -0400

    Merge branch 'maint-0.3.1'

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