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

[mikeperry@xxxxxxxxxxxxxx]

commit 75ca11ab52c75d4f3924c8cf0f3d50cf968a0810
Merge: 802e620 b0e19e9
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Wed Apr 10 23:43:39 2013 -0700

    Merge branch 'maint-2.4'

 build-scripts/config/pound_tor.js                  |    4 +
 build-scripts/versions-alpha.mk                    |   62 +-
 build-scripts/versions.mk                          |   60 +-
 ...11-Limit-the-number-of-fonts-per-document.patch |  149 ++++-
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  708 +++++++++++++++++---
 ...not-expose-system-colors-to-CSS-or-canvas.patch |  195 +++++-
 ...solate-the-Image-Cache-per-url-bar-domain.patch |   10 +-
 .../0028-Use-Optimistic-Data-SOCKS-variant.patch   |   82 +++
 watch-scripts/fetch-thirdparty.sh                  |   83 +++
 watch-scripts/verify-mirror.sh                     |   97 +++
 watch-scripts/versions.sh                          |   33 +
 watch-scripts/watch-firefox.sh                     |   29 +
 12 files changed, 1334 insertions(+), 178 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits