[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit c4b6b573880ba3f4806fed09e20ff384b556e277
Merge: b063ca060 8013e3e8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 29 15:57:31 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug28202     | 4 ++++
 src/or/parsecommon.c | 3 +--
 src/or/routerparse.c | 7 +++----
 3 files changed, 8 insertions(+), 6 deletions(-)