commit 660007aa541e3c8cc4fda2776e8a277fdbc74915 Merge: c2f11e3 2846221 Author: Georg Koppen gk@torproject.org Date: Fri Jun 29 11:29:06 2018 +0000

Merge remote-tracking branch 'boklm/bug_26410'

Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)