[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
arma at torproject.org
arma at torproject.org
Sat May 21 22:14:07 UTC 2011
commit 5269d106d862810ac000aa8fb1bc0e38b42b5327
Merge: 16bfb4d 0e8949a
Author: Roger Dingledine <arma at torproject.org>
Date: Sat May 21 18:13:46 2011 -0400
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug1810 | 6 ++++++
src/common/util.c | 2 +-
src/or/circuitbuild.c | 2 +-
src/or/config.c | 2 +-
src/or/router.c | 1 -
5 files changed, 9 insertions(+), 4 deletions(-)
More information about the tor-commits
mailing list