[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 929ebde2b908616fac381be78a5828c9d0fdd273
Merge: ca431c5 85c5390
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Feb 9 04:02:18 2012 -0500

    Merge branch 'maint-0.2.2'

 changes/manual_uri_in_torrc |    3 ---
 src/config/torrc.sample.in  |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)