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

[gk at torproject.org]

commit f44c5d73cfe8d47a6394939e9c237cfbd45a0c5f
Merge: 93a114b 1b79a12
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Mar 12 14:05:21 2019 +0000

    Merge remote-tracking branch 'boklm/bug_25876_v9'

 Makefile                     | 15 +++++++++++++++
 README.MAKEFILE              | 11 ++++++++---
 projects/firefox/config      | 12 ++++++++++++
 projects/release/build       |  6 ++++++
 projects/release/config      | 32 ++++++++++++++++++++++++++++++++
 projects/tor-launcher/config |  8 ++++++++
 projects/torbutton/config    |  8 ++++++++
 rbm.conf                     |  9 +++++++++
 8 files changed, 98 insertions(+), 3 deletions(-)