commit 5d5401f7a0831702d913d5e469f70954c5796edb Merge: ce2f13c 1633185 Author: Georg Koppen <gk@torproject.org> Date: Tue Jun 26 19:30:03 2018 +0000 Merge remote-tracking branch 'boklm/bug_26489' tools/dmg2mar | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)