[ tor ] .git.dasho

commit 39c5e1b84994c2f226a8530b930f215cc5ffb877
parent c1d4399c82d7a04e6c89487d76e07f2304fe55d2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 29 Jan 2020 19:44:34 -0500

Merge branch 'maint-0.4.2'

Use "-s ours" to avoid version bump.

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