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

[nickm at torproject.org]

commit d34fa32ece2179c18f8aeae0026d2b452956842f
Merge: 553cd7f 15cc41e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 19 06:49:04 2017 -0400

    Merge branch 'ticket21953_029'

 src/or/main.c | 3 +++
 1 file changed, 3 insertions(+)