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

[nickm at torproject.org]

commit c51919b0da2afe73780508e5593ebf9052e177cc
Merge: 6747c62 074f248
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:25:34 2017 -0500

    Merge branch 'bug21369_check_029_squashed' into 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(-)