My branches of https://gitweb.torproject.org/stem.git