[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_34234'

[sysrqb at torproject.org]

commit 4861f97c0f74bb1f69d422cdf6967a6628a05031
Merge: d3c7af8 8feea5a
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Aug 24 18:53:59 2020 +0000

    Merge remote-tracking branch 'gkgl/bug_34234'

 README                            | 2 +-
 projects/debootstrap-image/config | 7 -------
 projects/https-everywhere/config  | 6 +++---
 rbm.conf                          | 8 ++++----
 4 files changed, 8 insertions(+), 15 deletions(-)