[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'acat/33845_fix_patch'

[boklm at torproject.org]

commit ba31ac419a33126882c45c94923614a555e80284
Merge: 4b9ad6d d3a7505
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Apr 9 22:42:25 2020 +0200

    Merge remote-tracking branch 'acat/33845_fix_patch'

 projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 17 deletions(-)