commit b61a0497f0258ffebb2586c41267462e16a69cf0 Merge: 38624f8 32ce9d2 Author: Georg Koppen gk@torproject.org Date: Tue Dec 17 20:09:03 2019 +0000

Merge remote-tracking branch 'boklm/bug_32750_v4'

tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 + tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)