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

[nickm at torproject.org]

commit b6a9be0415587b161e59702a56cbfa42d1ac31c8
Merge: 90283f0 c51919b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:25:46 2017 -0500

    Merge branch 'maint-0.3.0'

 changes/bug21369_check |  3 +++
 src/or/buffers.c       | 21 +++++++++++++++++++++
 src/or/dirserv.c       | 10 ++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)