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

[erinn at torproject.org]

commit d4b7a1f7f238be0b56729ba062b6861b81196f05
Merge: 1344c9c 2585807
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Apr 27 12:09:18 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

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