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

[nickm at torproject.org]

commit 31dd7dec9a9ca6cf6e146fc429ee6be8bcd2042d
Merge: 9d47f4d e0e729d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 15:08:42 2017 -0500

    Merge branch 'bug20684_030_01'

 src/or/config.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)