[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_25420_v4'

[gk at torproject.org]

commit dcce85b6d858d5438bdc68098e846c8ea73c5df6
Merge: 8e21b34 d3e2dd7
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Apr 11 08:28:31 2018 +0000

    Merge remote-tracking branch 'boklm/bug_25420_v4'

 projects/mingw-w64/build  | 2 +-
 projects/mingw-w64/config | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)