[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'arthur/20628+1'

[gk at torproject.org]

commit b39dad476f870b60d7008c1e22e477dc80875c38
Merge: 6402ea6 7ccafbc
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 22 05:30:07 2018 +0000

    Merge remote-tracking branch 'arthur/20628+1'

 rbm.conf | 5 +++++
 1 file changed, 5 insertions(+)