commit 1344c9c6e824c19de3bf9fb1949aac615559a152 Merge: bb64a64 4a4879a Author: Erinn Clark erinn@torproject.org Date: Fri Apr 27 10:50:05 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

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