[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
nickm at torproject.org
nickm at torproject.org
Tue Apr 2 14:43:12 UTC 2013
commit a934376049fa1a55ca729731ac68da7978953447
Merge: 7ccaf3f 856d575
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Apr 2 10:42:53 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug7707_diagnostic | 5 +++++
src/common/tortls.c | 25 +++++++++++++++++++++++++
src/common/tortls.h | 2 ++
src/or/status.c | 6 ++++++
4 files changed, 38 insertions(+), 0 deletions(-)
More information about the tor-commits
mailing list