[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature6758'
nickm at torproject.org
nickm at torproject.org
Tue Sep 4 14:16:22 UTC 2012
commit 3da9a14f1c8b02215db1a14e31b6d5de4074998b
Merge: 978a225 e964f81
Author: Nick Mathewson <nickm at 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(-)
More information about the tor-commits
mailing list