[ tor ] .git.dasho

commit f42c3cfe2e3568bea0d521c972e252ba2dcf4188
parent 5065a685049f46a955299c69fb98448630ba75d5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 16 Nov 2018 11:32:10 -0500

Merge branch 'maint-0.3.5'

"ours" to avoid version bump.

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