[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25554_v2'

[boklm at torproject.org]

commit ddc77b4d679b3027924b89350dce9b672967e625
Merge: ba7b30a 4c1f78c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jun 4 13:44:20 2018 +0200

    Merge remote-tracking branch 'gk/bug_25554_v2'

 projects/mingw-w64/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)