commit e54a5a4f3c65dc8ab5470a91a48f500982b7d10e
Merge: 1b026ef 922ab08
Author: Nick Mathewson <[email protected]>
Date: Thu Apr 11 01:47:10 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/bug8185_diagnostic | 3 +++
src/or/relay.c | 22 +++++++++++++++-------
src/or/relay.h | 10 ++++++++--
3 files changed, 26 insertions(+), 9 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
