[tor-commits] [torbrowser/master] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.3

[erinn at torproject.org]

commit 75d85238cf6fcba0a63c98cf4bb2ed88ed862ffd
Merge: 3f7669a c3782f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 6 15:00:37 2012 +0200

    Merge remote-tracking branch 'origin/maint-2.2' into maint-2.3
    
    Used -s ours as discussed with Mike to avoid merge conflicts in patches.
    
    Mike, if this was *NOT* okay with you, then I totally misunderstood our
    conversation, and take full responsibility for cleaning the floor up
    after myself.
     -Nick