[ tor ] .git.dasho

commit 837f11a5320872ff9ab3565c9e2ddc44f127e843
parent f537202196355bb73bb17f18f4d2629298e379ef
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  7 Aug 2018 20:15:50 -0400

Merge branch 'maint-0.3.4'

"ours" merge to avoid version bump.

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