git.ipfire.org Git - thirdparty/tor.git/commit

]> git.ipfire.org Git - thirdparty/tor.git/commit

projects / thirdparty / tor.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3d2366c 12b6c7d)

author	Nick Mathewson <nickm@torproject.org>
	Fri, 28 Nov 2014 03:39:46 +0000 (22:39 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 28 Nov 2014 03:39:46 +0000 (22:39 -0500)
commit	a28df3fb6713043e801fb5fcf5019fc0539b5066
tree	c67fce712d60ac0ff073b0c59bb4b06e7dae04b4	tree \| snapshot
parent	3d2366c676233c30133928940b4bc19d8f25f193	commit \| diff
parent	12b6c7df4aaf3224bc5649ef69a06dccc58ae961	commit \| diff

Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'

Conflicts:
src/or/or.h
src/test/Makefile.nmake

29 files changed:

src/common/compat_libevent.c	diff1 \|	diff2 \|	blob \| history
src/common/compat_libevent.h	diff1 \|	diff2 \|	blob \| history
src/common/torlog.h	diff1 \|	diff2 \|	blob \| history
src/or/buffers.c	diff1 \|	diff2 \|	blob \| history
src/or/buffers.h	diff1 \|	diff2 \|	blob \| history
src/or/channel.c	diff1 \|	diff2 \|	blob \| history
src/or/channel.h	diff1 \|	diff2 \|	blob \| history
src/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/or/channeltls.h	diff1 \|	diff2 \|	blob \| history
src/or/circuitbuild.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.h	diff1 \|	diff2 \|	blob \| history
src/or/circuitmux.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitmux.h	diff1 \|	diff2 \|	blob \| history
src/or/circuitmux_ewma.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/config.h	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.h	diff1 \|	diff2 \|	blob \| history
src/or/include.am	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	diff1 \|	diff2 \|	blob \| history
src/or/relay.h	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.nmake	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history
src/test/test.c	diff1 \|	diff2 \|	blob \| history
src/test/test_circuitmux.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://git.torproject.org/tor.git