please merge Tor packaging changes

In branch 'packaging-improvements': https://gitweb.torproject.org/erinn/tor.git