commit 8d7c170ac77f1a9901b1ef3fc36a9144ac3cd4cb Merge: b71d186 8043f25 Author: Georg Koppen gk@torproject.org Date: Wed Oct 17 11:47:17 2018 +0000

Merge remote-tracking branch 'pc/bug26263-01'

.../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 15365 bytes .../mac-applications.dmg/.background/background.png | Bin 50020 -> 0 bytes .../.background/background.tiff | Bin 0 -> 36170 bytes .../.fseventsd/0000000000400c60 | Bin 173 -> 0 bytes .../mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 - 5 files changed, 1 deletion(-)