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

[boklm at torproject.org]

commit 966c55d754aaf7d181e85d73474d4014eb72a6ac
Merge: ef90f3c 94b31b1
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Jun 1 12:51:24 2018 +0200

    Merge remote-tracking branch 'gk/bug_9711_v2'

 projects/cctools/build  | 24 ++++++++++++++++++++++++
 projects/cctools/config | 16 ++++++++++++++++
 2 files changed, 40 insertions(+)