diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-30 15:40:32 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-10-03 02:42:47 +0200 |
| commit | ba689a2740d47636245451a34de50a2f59d890ba (patch) | |
| tree | 75c5390e4471c779dc4f6ab8c83dffd33cd27d49 /pkgs | |
| parent | ae4c8e0889178562e0927d39726fd32984ffc388 (diff) | |
| download | nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar.gz nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar.bz2 nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar.lz nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar.xz nixlib-ba689a2740d47636245451a34de50a2f59d890ba.tar.zst nixlib-ba689a2740d47636245451a34de50a2f59d890ba.zip | |
tor-browser-bundle: support transports obfs2,obfs3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 0e9610247c8c..ddec26e9833b 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -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>," \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cbb7961f3ed..d1c930a769f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |