Update Tor to 0.2.4.21 and tor-browser to 3.6.1 on release 14.04

These were recently pushed to master. If possible I'd like them to be pushed to release-14.04. The existing definitions in 14.04 are broken in that the URLs are no longer valid (they return 404) and they are older insecure versions.