[ tor ] .git.dasho

commit 4f4d3de80c6de40dc4c7face055ec6d3abf3ed27
parent 6e7551c50da818bba38dca8612e654885b723ac5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu,  8 Jun 2017 14:06:49 -0400

Merge branch 'maint-0.3.0'

"ours" merge to avoid version bump.

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