[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33864'

[gk at torproject.org]

commit dead06d60f62a8042fbf8a1d67a7f7835b7d5fce
Merge: 07df060 efe9341
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 1 06:48:50 2020 +0000

    Merge remote-tracking branch 'boklm/bug_33864'

 tools/ansible/roles/tbb-nightly-build/defaults/main.yml           | 2 ++
 tools/ansible/roles/tbb-nightly-build/tasks/main.yml              | 8 ++++++++
 tools/ansible/roles/tbb-nightly-build/templates/nginx.conf        | 4 ++++
 .../templates/tbb-nightly-build.auth_basic_user_file              | 1 +
 4 files changed, 15 insertions(+)