[tor-commits] [tor/master] Merge branch 'ticket20119'

[nickm at torproject.org]

commit c151f46445ac76e5ab13688eba5612ada5c5af45
Merge: ad3f0953e 1098893e4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 8 08:56:53 2017 -0400

    Merge branch 'ticket20119'

 changes/feature20119_1 |  3 +++
 src/common/util.c      | 15 +++++++++++----
 src/common/util.h      |  2 +-
 src/or/config.c        |  8 ++++++--
 4 files changed, 21 insertions(+), 7 deletions(-)