commit dd098db690092cba90a315853d624b5bf1cd97fe Merge: da3351f f75cf0b Author: Georg Koppen gk@torproject.org Date: Tue May 14 13:47:47 2019 +0000

Merge branch 'bug_29641'

projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 + projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults | 1 + 3 files changed, 3 insertions(+)