commit b1e6dd922f17555ad153cd9e05997ca41e50417a Merge: 8fd3d1d 2b3a355 Author: Georg Koppen gk@torproject.org Date: Tue May 29 07:48:51 2018 +0000

Merge remote-tracking branch 'boklm/bug_26165_v2'

projects/firefox/build | 10 ++-------- projects/gcc/config | 36 ++++++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-)