[ tor ] .git.dasho

commit cd4ae97448ea503111d6f235624a4594f7ff3470
parent fc1316b559a387710201649395593680bcaa242f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Nov 2019 16:39:44 -0500

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

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