Public Git Hosting - tor.git/commit

commit	c6523a6398efb07831ede8234486ee8f385ed558
author	Nick Mathewson <nickm@torproject.org>
	Mon, 13 May 2019 18:25:54 +0000 (13 14:25 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 13 May 2019 18:25:54 +0000 (13 14:25 -0400)
tree	68e3e09f04797a28d79db0f3f36a8265fd022527	tree \| snapshot (tar.gz zip)
parent	def96ce83858b214ebc01797e41e4f0419f9d104	commit \| diff
parent	e1771aeb51fd8f92db66fc1e9d0d8aad5ff9f169	commit \| diff

Merge remote-tracking branch 'tor-github/pr/998'

The Onion Router

scripts/maint/practracker/exceptions.txt	diff1 \|	diff2 \|	blob \| history
src/core/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/core/or/relay.c	diff1 \|	diff2 \|	blob \| history
src/core/or/relay.h	diff1 \|	diff2 \|	blob \| history