commit 51e32622701c743727d9903c67e38579c1bc7b8b Author: Nicolas Vigier boklm@torproject.org Date: Fri Oct 27 21:57:43 2017 +0200

Bug 23561: Use a 32bit nsis in the Windows 64 build --- projects/tor-browser/config | 3 +++ rbm.conf | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/config b/projects/tor-browser/config index a777a98..54a0e9e 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,6 +67,9 @@ input_files: enable: '[% c("var/osx") %]' - project: nsis name: nsis + target: + - '[% c("var/channel") %]' + - torbrowser-windows-i686 enable: '[% c("var/windows") %]' - name: tbb-windows-installer project: tbb-windows-installer diff --git a/rbm.conf b/rbm.conf index 83c2086..79d7055 100644 --- a/rbm.conf +++ b/rbm.conf @@ -106,12 +106,15 @@ targets: release: var: release: 1 + channel: release alpha: var: - alpha:1 + alpha: 1 + channel: alpha nightly: var: nightly: 1 + channel: nightly torbrowser_version: tbb-nightly

torbrowser-testbuild: