[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug16248_027'

[nickm at torproject.org]

commit a64be7eaa9add3ac147447faae77906bbafd1b0a
Merge: d8b93b3 307b863
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 14 12:53:57 2016 -0400

    Merge remote-tracking branch 'public/bug16248_027'

 changes/bug16248 |  8 ++++++++
 src/or/main.c    | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 59 insertions(+), 4 deletions(-)