tor-browser-bundle: support transports obfs2,obfs3

This commit is contained in:
Joachim Fasting 2017-09-30 15:40:32 +02:00
parent ae4c8e0889
commit ba689a2740
No known key found for this signature in database
GPG key ID: 66EAB6B14F6B6E0D
2 changed files with 10 additions and 0 deletions

View file

@ -36,6 +36,9 @@
, python27Packages
, rsync
# Pluggable transports
, obfsproxy
# Customization
, extraPrefs ? ""
, extraExtensions ? [ ]
@ -165,8 +168,14 @@ stdenv.mkDerivation rec {
>> $TBDATA_PATH/torrc-defaults
cat \
$bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
$bundleData/PTConfigs/bridge_prefs.js \
>> defaults/pref/extension-overrides.js
# Configure pluggable transports
cat >>$TBDATA_PATH/torrc-defaults <<EOF
ClientTransportPlugin obfs2,obfs3 exec ${obfsproxy}/bin/obfsproxy managed
EOF
# Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below
sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \
-e "s,<dir>fonts</dir>,<dir>${fontsDir}</dir>," \

View file

@ -4658,6 +4658,7 @@ with pkgs;
tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle {
stdenv = stdenvNoCC;
tor-browser-unwrapped = firefoxPackages.tor-browser;
inherit (python27Packages) obfsproxy;
};
touchegg = callPackage ../tools/inputmethods/touchegg { };