[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'jrand/namecoin-3.3.11'

[gk at torproject.org]

commit 7cfa5d9cdb6f18bfed3e3d8ebe992c9b23084b26
Merge: 95c2aff 2efbd8c
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Jun 14 21:16:10 2020 +0000

    Merge remote-tracking branch 'jrand/namecoin-3.3.11'

 projects/electrum-nmc/config                                 |  8 ++++----
 projects/stemns/config                                       |  2 +-
 projects/stemns/settings_services.py                         | 12 ++++++++++++
 .../tor-browser/Bundle-Data/linux/Data/Electrum-NMC/config   |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)