Take HTTP timestamps in addition to SOCKS timestamps.
unused method removed
Merge branch 'perfd' of https://git.torproject.org/karsten/torperf into txtorcon-integration
Fixes and changes to resources, producers, etc