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

[nickm at torproject.org]

commit c0a6c3465270355a09a93c1b48ba496e0f36cf0c
Merge: 162d202 92b1c3b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 10 16:32:05 2016 -0500

    Merge remote-tracking branch 'teor/bug18208'

 changes/bug18208 |  5 +++++
 src/or/main.c    | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)