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

[gk at torproject.org]

commit c14145264cd1f8eaff3a465d0014d5bf1d061e8a
Merge: ed424fd 99b49ad
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Apr 10 13:46:27 2019 +0000

    Merge remote-tracking branch 'boklm/bug_30089_v4'

 projects/android-toolchain/build   | 4 +---
 projects/debootstrap-image/config  | 8 --------
 projects/tor-browser/build.android | 2 +-
 projects/tor-browser/config        | 6 +-----
 rbm.conf                           | 2 ++
 5 files changed, 5 insertions(+), 17 deletions(-)