[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug22421'

[nickm at torproject.org]

commit f9615f9d770e035829e1ff238980d6ac6e852150
Merge: 167e5be 25ea8be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 30 08:42:20 2017 -0400

    Merge remote-tracking branch 'teor/bug22421'

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