[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3851'
nickm at torproject.org
nickm at torproject.org
Wed Sep 7 15:20:36 UTC 2011
commit 947012e153e76ceb8015ea426a895f21b63cd677
Merge: 9ef2cd7 3b02a95
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Sep 7 11:22:24 2011 -0400
Merge remote-tracking branch 'public/bug3851'
changes/bug3851 | 4 ++++
src/or/microdesc.c | 9 +++++++--
src/or/networkstatus.c | 4 ++++
3 files changed, 15 insertions(+), 2 deletions(-)
More information about the tor-commits
mailing list