commit f16f8734b4834eaccd4d2c9dc018084f766b60f9 Merge: b1ce9a7 7b1c46d Author: Georg Koppen gk@torproject.org Date: Thu Jul 4 20:01:53 2019 +0000

Merge remote-tracking branch 'boklm/bug_30468'

projects/firefox-locale-bundle/build | 2 ++ projects/firefox/build | 6 ++++-- rbm.conf | 1 + 3 files changed, 7 insertions(+), 2 deletions(-)