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

[gk at torproject.org]

commit 9a5354b1ba43853e845e93ed1d25c5d2ba582fe6
Merge: bfc677f e47bc3b
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 12 06:57:01 2019 +0000

    Merge remote-tracking branch 'boklm/bug_30128_v2'

 rbm.conf | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)