diff --git a/app/browser/tabs.js b/app/browser/tabs.js index 835b220646b..2909cc22115 100644 --- a/app/browser/tabs.js +++ b/app/browser/tabs.js @@ -6,6 +6,7 @@ const appActions = require('../../js/actions/appActions') const windowActions = require('../../js/actions/windowActions') const tabActions = require('../common/actions/tabActions') const config = require('../../js/constants/config') +const {getExtensionsPath} = require('../../js/lib/appUrlUtil') const Immutable = require('immutable') const { shouldDebugTabEvents } = require('../cmdLine') const tabState = require('../common/state/tabState') @@ -39,6 +40,7 @@ const bookmarkOrderCache = require('../common/cache/bookmarkOrderCache') const ledgerState = require('../common/state/ledgerState') const {getWindow} = require('./windows') const activeTabHistory = require('./activeTabHistory') +const path = require('path') let adBlockRegions let currentPartitionNumber = 0 @@ -1015,6 +1017,11 @@ const api = { createProperties.isolated_storage = true createProperties.parent_partition = '' createProperties.tor_proxy = 'socks5://127.0.0.1:9050' + if (process.platform === 'win32') { + createProperties.tor_path = path.join(getExtensionsPath('bin'), 'tor.exe').quote() + } else { + createProperties.tor_path = path.join(getExtensionsPath('bin'), 'tor') + } } } diff --git a/app/filtering.js b/app/filtering.js index d92bf3377a7..9455053ecf4 100644 --- a/app/filtering.js +++ b/app/filtering.js @@ -15,6 +15,7 @@ const hostContentSettings = require('./browser/contentSettings/hostContentSettin const downloadStates = require('../js/constants/downloadStates') const urlParse = require('./common/urlParse') const getSetting = require('../js/settings').getSetting +const {getExtensionsPath} = require('../js/lib/appUrlUtil') const appUrlUtil = require('../js/lib/appUrlUtil') const siteSettings = require('../js/state/siteSettings') const settings = require('../js/constants/settings') @@ -691,6 +692,11 @@ const initPartition = (partition) => { options.isolated_storage = true options.parent_partition = '' options.tor_proxy = 'socks5://127.0.0.1:9050' + if (process.platform === 'win32') { + options.tor_path = path.join(getExtensionsPath('bin'), 'tor.exe').quote() + } else { + options.tor_path = path.join(getExtensionsPath('bin'), 'tor') + } } let ses = session.fromPartition(partition, options)