commit 19baca4837557cf25760fb80478bf3f9ad6822e1 Merge: b5f2b44 f31ba6a Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 9 16:20:14 2011 -0500

Merge remote branch 'origin/maint-0.2.2'

changes/bug2574 | 3 +++ contrib/suse/tor.sh.in | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-)