[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'sisbellgh/bug-31130i'

[sysrqb@xxxxxxxxxxxxxx]

commit 3f341196fba76654999faa42139c5fa46882b527
Merge: ffc6f84 1961708
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Thu Feb 20 21:24:55 2020 +0000

    Merge remote-tracking branch 'sisbellgh/bug-31130i'

 projects/debootstrap-image/config       | 17 +++++++++--------
 projects/firefox/build                  |  1 +
 projects/firefox/config                 |  5 -----
 projects/https-everywhere/config        |  1 +
 projects/tor-android-service/config     |  6 ------
 projects/tor-browser/build.android      |  2 +-
 projects/tor-browser/config             |  1 -
 projects/tor-onion-proxy-library/config |  6 ------
 rbm.conf                                | 13 ++++++++++++-
 9 files changed, 24 insertions(+), 28 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits