Update tor to 0.2.4.21
(cherry picked from commit f76e56fb38c15ff5aa1b6da5773ceb32b22b9383)
Update tor-browser to 3.6
(cherry picked from commit 1d1a1c258590c876071762f6ac341ae29ac8752f)