commit feb32165494be68c1d29a48ef9d4d9cf8b0b36ed
Merge: 2183169 b6be541
Author: Mike Perry <[email protected]>
Date: Thu Feb 12 18:01:12 2015 -0800
Merge remote-tracking branch 'brade/bug13900-01' into
tor-browser-31.4.0esr-4.5-1
content/base/src/ThirdPartyUtil.cpp | 21 ++++++---
netwerk/base/public/mozIThirdPartyUtil.idl | 22 ++++++++-
netwerk/protocol/http/nsHttpChannel.cpp | 70 ++++++++++++++++++++++++++++
netwerk/protocol/http/nsHttpChannel.h | 1 +
4 files changed, 107 insertions(+), 7 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
