Merge commit '74759fe04c0fa1d465cb36d3f8b00d6ebd9ef49d'

qutebrowser/browser/commands.py

@@ -1220,6 +1220,7 @@ class CommandDispatcher:
         log.procs.debug("Executing {} with args {}, userscript={}".format(
             cmd, args, userscript))
 
+        @pyqtSlot()
         def _on_proc_finished():
             if output:
                 tb = objreg.get('tabbed-browser', scope='window',

qutebrowser/browser/network/proxy.py

@@ -61,7 +61,8 @@ class ProxyFactory(QNetworkProxyFactory):
         """
         proxy = config.val.content.proxy
         if proxy is configtypes.SYSTEM_PROXY:
-            # On Linux, use "export http_proxy=socks5://host:port" to manually set system proxy
+            # On Linux, use "export http_proxy=socks5://host:port" to manually
+            # set system proxy.
             # ref. http://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
             proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         elif isinstance(proxy, pac.PACFetcher):