commit d0bd427db75d980be121b12f30f59f18c4e47325 Merge: c65b5af dfa0cc4 Author: Georg Koppen gk@torproject.org Date: Tue Oct 16 18:02:12 2018 +0000

Merge remote-tracking branch 'boklm/bug_27218_v4'

projects/tor-browser/build | 28 ++++++++++++++++++++++------ projects/tor-browser/config | 16 ++++++++++------ projects/tor-browser/ddmg.sh | 10 +++++----- projects/tor-browser/run_scripts | 30 ++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 17 deletions(-)