Update Tor to 0.2.4.21 and tor-browser to 3.6

Updates Tor and Tor Browser to latest stable versions.