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

[boklm at torproject.org]

commit 90aa993289db466f928244443d2acdf6c8a2652d
Merge: ddc77b4 a593f15
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jun 4 13:58:10 2018 +0200

    Merge remote-tracking branch 'gk/bug_25548_v2'

 projects/macosx-toolchain/build  | 4 ++--
 projects/macosx-toolchain/config | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)