commit af04bd489b79acd4614119f26944fac2835fe641 Merge: b85eb94 879f171 Author: Roger Dingledine arma@torproject.org Date: Fri Mar 11 17:42:00 2011 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

ReleaseNotes | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ changes/bug2573 | 3 ++ contrib/suse/tor.sh.in | 8 +++++++ doc/HACKING | 9 +++++++- 4 files changed, 70 insertions(+), 1 deletions(-)