[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
nickm at torproject.org
nickm at torproject.org
Mon Jun 6 20:20:35 UTC 2011
commit 8cd5a3c1865c2115d88b08041a27e2cfdd7d24d2
Merge: 96da10a 9e3fc5f
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jun 6 16:20:22 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug3306 | 9 +++++++++
src/common/crypto.c | 5 +++--
src/or/circuitbuild.c | 10 +++++++++-
3 files changed, 21 insertions(+), 3 deletions(-)
More information about the tor-commits
mailing list