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

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

projects / thirdparty / tor.git / commit

author	Nick Mathewson <nickm@torproject.org>
	Fri, 15 Nov 2013 20:35:00 +0000 (15:35 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Fri, 15 Nov 2013 20:35:00 +0000 (15:35 -0500)
commit	7a2b30fe16eacc040b3dd11f8c39c410628c2f43
tree	356e060be24608160a8e5d4fea33d39cc01a4c46	tree \| snapshot
parent	4aa9affec2eac0a95ba026e380718b032451a0af	commit \| diff
parent	59f50c80d443a7e148f85cfed493e3e703cc4386	commit \| diff

Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
src/or/relay.c

Conflict changes were easy; compilation fixes required were using
using TOR_SIMPLEQ_FIRST to get head of cell queue.

src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/common/util.h	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/common/util.h	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/relay.c	diff1 \|	diff2 \|	blob \| history