Switched sources back to torproject.org

tbb-bin should only be necessary as a fallback for setup.sh
Updated version numbers to 3.6.1