Merge pull request #2634 from doublec/tor

Update Tor to 0.2.4.21 and tor-browser to 3.6.1
(cherry picked from commit cc9b8a8b6fb53ae2abd4ab5444fdfcf9447f525a)

Fixes #2657.