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

[nickm at torproject.org]

commit 891cf72f7103bc5b4de26ac974c0fd42a9d3c88f
Merge: d9ceab5 b41dd80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 10:36:30 2012 -0400

    Merge branch 'bug5095_squashed'

 changes/bug5095 |    4 ++++
 src/or/config.c |    6 ++++--
 src/or/main.c   |    8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)