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

[mikeperry at torproject.org]

commit 3cd7c2cb8284e47dabe896ce2164b13867ef2a7c
Merge: 7caba4b 6787354
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Apr 11 15:50:08 2012 -0700

    Merge remote-tracking branch 'mikeperry/maint-2.2' into maint-2.3

 ...6-Randomize-HTTP-pipeline-order-and-depth.patch |  151 -------------
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  234 ++++++++++++++++++++
 2 files changed, 234 insertions(+), 151 deletions(-)