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

[nickm at torproject.org]

commit bb9044381e6e32fab1708c3e9420a4090b2509de
Merge: bcba6a491 8a5590eba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 15:20:01 2018 -0500

    Merge branch 'maint-0.3.5'

 changes/bug28298        |  4 ++++
 src/app/config/config.c | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)