commit 5e72f5077d7c974e30c9f48f2c554ded6e8358d1 Merge: b9a2dfe aa79add Author: Nicolas Vigier boklm@torproject.org Date: Fri Jun 15 11:31:19 2018 +0200

Merge remote-tracking branch 'gk/bug_23231'

projects/firefox/STL_win64.patch | 24 ------------------------ projects/firefox/build | 4 ---- projects/firefox/config | 2 -- 3 files changed, 30 deletions(-)