[ tor ] .git.dasho

commit 2e54c80aec5ed4684950f5ef1ba208fcc0b8339c
parent 81175ecafd29078d8b46db51f0393f31a9fcdea4
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 24 Aug 2018 16:50:24 -0400

Merge branch 'maint-0.3.4'

"ours" to avoid version bump.

	tor The Tor anonymity network
	git clone https://git.dasho.dev/tor.git
	Log \| Files \| Refs \| README \| LICENSE