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

[nickm at torproject.org]

commit fda8b5de78f0f436557b2e5c0a87df8450f91e85
Merge: b43c44652 9d75f7984
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 29 15:57:31 2018 -0400

    Merge branch 'maint-0.3.5'

 changes/bug28202                       | 4 ++++
 src/feature/dirparse/microdesc_parse.c | 6 +++---
 src/feature/dirparse/parsecommon.c     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)