Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 14d58bb bbc9cbd)

commit	7f145b54afb2cb1d9390a65bf31e2dddeb5b87da
author	Nick Mathewson <nickm@torproject.org>
	Fri, 12 Aug 2016 20:11:28 +0000 (12 16:11 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 12 Aug 2016 20:11:28 +0000 (12 16:11 -0400)
tree	f184f7c342e95e36a6b80e2c7fddde7f76c3aa7e	tree \| snapshot (tar.gz zip)
parent	14d58bbb4a9f08d51a58ea0a75d5535a05bfc9e8	commit \| diff
parent	bbc9cbd95839380a45ec9ff11a7f7b99bbe923b0	commit \| diff

Merge remote-tracking branch 'public/Fix_19450'

14 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/common/compat_libevent.c	diff1 \|	diff2 \|	blob \| history
src/common/compat_libevent.h	diff1 \|	diff2 \|	blob \| history
src/or/buffers.c	diff1 \|	diff2 \|	blob \| history
src/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/connection.h	diff1 \|	diff2 \|	blob \| history
src/or/connection_edge.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.c	diff1 \|	diff2 \|	blob \| history
src/or/control.c	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	diff1 \|	diff2 \|	blob \| history
src/test/test_buffers.c	diff1 \|	diff2 \|	blob \| history
src/test/test_oom.c	diff1 \|	diff2 \|	blob \| history

The Onion Router