[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/feature15482_fixup'

[nickm at torproject.org]

commit fa89eb60e952b964147bddd8d40e503e6872a291
Merge: 2f8c058 f6c446d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 9 09:56:59 2015 -0400

    Merge remote-tracking branch 'yawning/feature15482_fixup'

 src/or/config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)