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

[gk at torproject.org]

commit fb97d6c9141d3a824954b2e2952974daeada26d7
Merge: 4d5e3d2 0e483da
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Jun 4 10:50:51 2018 +0000

    Merge remote-tracking branch 'boklm/bug_25859_v4'

 projects/zlib/build  | 6 ++----
 projects/zlib/config | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)