[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[mikeperry at torproject.org]

commit 6269eee11a5b6208a2fa51d9d11651fc4c1d4064
Merge: 75ca11a a241fb2
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Thu Apr 11 02:35:25 2013 -0700

    Merge branch 'maint-2.4'

 build-scripts/config/pound_tor.js                  |    4 ++
 ...ize-HTTP-request-order-and-pipeline-depth.patch |   33 +++++++++++++++-----
 2 files changed, 29 insertions(+), 8 deletions(-)