bug_21861_v2 (https://gitweb.torproject.org/user/gk/tor-browser.git/commit/?h=bug_21861_v2&id=e1216ec38f9a2a544763bde44c758275c1f2cb78) has a fix for this bug. I built with it for all three platforms in our Gitian environment and nothing blew up. Although, the Linux build did not want to compile first. I tried with the same patch locally and later on in Gitian as well and things worked then. Thus, I guess the first build failure was unrelated (the log was not really clear about why the build failed).
Trac: Keywords: TorBrowserTeam201705 deleted, TorBrowserTeam201705R added Status: assigned to needs_review
Thanks, applied to tor-browser-52.1.1esr-7.0-1 and tor-browser-52.1.0esr-7.0-2 (commit 0da4a7dc08b0c9b4fa6c454da210e8c3c3ae6197 and a979fd68b78a17814bde3544b7d8896c6089cf6e).
Trac: Status: needs_review to closed Resolution: N/Ato fixed