[tbb-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.

[mikeperry at torproject.org]

commit e65a5a72227f5bb1915e5402fa945d0a9d3cf591
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Fri Oct 31 10:20:31 2014 -0700

    fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
---
 netwerk/base/src/nsProtocolProxyService.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
index ed8b311..b4a6a9c 100644
--- a/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/netwerk/base/src/nsProtocolProxyService.cpp
@@ -1020,7 +1020,7 @@ private:
 NS_IMPL_ISUPPORTS0(nsAsyncBridgeRequest)
 
 // nsProtocolProxyService
-NS_IMETHODIMP
+nsresult
 nsProtocolProxyService::DeprecatedBlockingResolve(nsIChannel *aChannel,
                                                   uint32_t aFlags,
                                                   nsIProxyInfo **retval)