[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug20201'

[nickm at torproject.org]

commit f6d7b71719db2e158b28f21d6f4a3861d860b3b0
Merge: 62ee4f1 f1d7b7b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 21 12:20:33 2016 -0400

    Merge remote-tracking branch 'isis/bug20201'

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