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

[nickm at torproject.org]

commit 19f1d3e331dfa34ab78d9bb90c61674e49ceae52
Merge: 1ec22ea f37d24c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 7 16:49:52 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    This merge is here to take a commit (feature 3951) that we already
    have in master, so use "merge -s ours"