Update tor to 0.2.4.21
Update tor-browser to 3.6
Merge pull request #2634 from doublec/tor

Update Tor to 0.2.4.21 and tor-browser to 3.6.1