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

[gk at torproject.org]

commit 16e629f680bbbe07a408a3022c3b819acd833bd2
Merge: b61a049 608fbb6
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Dec 18 13:58:26 2019 +0000

    Merge remote-tracking branch 'boklm/bug_25101_v12'

 .../roles/tbb-nightly-build/defaults/main.yml      |   4 +-
 .../roles/tbb-nightly-build/files/prune-old-builds | 136 +++++++++++++++++++++
 .../ansible/roles/tbb-nightly-build/tasks/main.yml |   7 ++
 .../tbb-nightly-build/templates/start-tbb-nightly  |   2 +-
 .../tbb-nightly-build/templates/testsuite-config   |   6 +-
 5 files changed, 150 insertions(+), 5 deletions(-)