[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug19466'

[nickm at torproject.org]

commit fdc2a9195686805e98e221150fa476afe2d394e9
Merge: 8f2f06c be820f4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 19 19:37:48 2016 -0400

    Merge remote-tracking branch 'public/bug19466'

 changes/bug19466 |  3 +++
 src/or/config.c  | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)