[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
nickm at torproject.org
nickm at torproject.org
Tue May 17 23:52:13 UTC 2011
commit c240efab86d71d8953a36e0599bfc789ee980b71
Merge: e0e8424 bc89ef0
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue May 17 19:53:06 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug2752 | 5 +++++
src/or/config.c | 8 ++++----
src/or/connection.c | 13 +++++++++++--
3 files changed, 20 insertions(+), 6 deletions(-)
More information about the tor-commits
mailing list