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

[nickm at torproject.org]

commit ca431c54006341bf7097d2411b8742c4ab29e80d
Merge: 332e96d 55e8cae
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 8 10:52:34 2012 -0500

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/manual_uri_in_torrc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)