Update tor to 0.2.4.22 and tor browser to 3.6.2 on 14.04 branch

Applies tor update which has been on master for a couple of weeks to release 14.04.