commit 3da9a14f1c8b02215db1a14e31b6d5de4074998b Merge: 978a225 e964f81 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 4 10:16:15 2012 -0400

Merge remote-tracking branch 'arma/feature6758'

changes/feature6758 | 5 +++++ src/or/main.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)