[tor-commits] [tor/release-0.4.0] Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0