commit 6f2a09b585034c93419e192b6418518eeb68dea8 Merge: 31f5977 8831b1a Author: Erinn Clark erinn@torproject.org Date: Mon Oct 8 07:42:10 2012 +0100

Merge branch 'maint-2.2' into maint-2.3

build-scripts/versions.mk | 10 +- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 148 ++++++++++++++++++++ 2 files changed, 153 insertions(+), 5 deletions(-)