[ tor ] .git.dasho

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0
parent cdaf9aec8e7d81fb583075c9486f4af4216ded94
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  7 Sep 2018 15:11:49 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump

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