commit d10bf241430e8ad22a9c11d6579a4f8dc4d75805 Merge: 3a16b0d d303f9a Author: Tomás Touceda chiiph@torproject.org Date: Mon Jan 23 11:10:44 2012 -0300

Merge branch 'bug4833_sighuptorrc' into alpha

changes/bug4833 | 2 ++ src/torcontrol/TorControl.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-)