commit e6d886d23065815b1aabaf4b6aa197e1ab95c4ca Merge: d888d0a c95f25a Author: Mike Perry mikeperry-git@torproject.org Date: Thu Jun 25 18:56:12 2015 -0700

Merge branch '13670_fixup' into tor-browser-38.1.0esr-5.x-1

dom/base/ThirdPartyUtil.cpp | 9 +++++++++ netwerk/base/nsISocketTransport.idl | 2 +- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 2 +- netwerk/protocol/http/nsHttpConnectionMgr.h | 2 +- netwerk/protocol/http/nsHttpHandler.cpp | 2 +- security/manager/ssl/src/SSLServerCertVerification.cpp | 2 +- security/manager/ssl/src/TransportSecurityInfo.cpp | 7 ------- security/manager/ssl/src/TransportSecurityInfo.h | 3 +-- security/manager/ssl/src/nsNSSCallbacks.cpp | 10 ++++++---- 9 files changed, 21 insertions(+), 18 deletions(-)