Public Git Hosting - tor.git/commit

commit	2dccef0eb490fa7d8fabc0d93e37d6635910f174
author	Nick Mathewson <nickm@torproject.org>
	Sun, 14 Oct 2018 19:31:52 +0000 (14 15:31 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Sun, 14 Oct 2018 19:31:52 +0000 (14 15:31 -0400)
tree	65138098218cb4b11ffcbd3f6ac90501c45e2e99	tree \| snapshot (tar.gz zip)
parent	2c5c17510acf0cbd0eeb874a2f4c62203bf9392f	commit \| diff
parent	6925b61cfdf50a5686de02645b04b269c031f05d	commit \| diff

Merge branch 'bug27772_squashed'

The Onion Router

src/core/mainloop/connection.c	diff1 \|	diff2 \|	blob \| history
src/core/or/channel.c	diff1 \|	diff2 \|	blob \| history
src/core/or/channelpadding.c	diff1 \|	diff2 \|	blob \| history
src/core/or/connection_edge.c	diff1 \|	diff2 \|	blob \| history
src/core/or/connection_edge.h	diff1 \|	diff2 \|	blob \| history
src/feature/dirparse/policy_parse.c	diff1 \|	\|	blob \| history
src/feature/nodelist/torcert.c	diff1 \|	diff2 \|	blob \| history
src/test/test_hs_service.c	diff1 \|	diff2 \|	blob \| history
src/test/test_relaycell.c	diff1 \|	diff2 \|	blob \| history
src/test/test_routerset.c	diff1 \|	diff2 \|	blob \| history