commit 978a2251f33416a95d5c2d8c8a844d1777d20429 Merge: 0a2fcc5 3ea37e5 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 4 10:14:55 2012 -0400

Merge remote-tracking branch 'arma/feature6760'

changes/feature6760 | 6 ++++++ src/or/main.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)