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>
	Tue, 17 Dec 2013 18:18:00 +0000 (13:18 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 17 Dec 2013 18:18:00 +0000 (13:18 -0500)
commit	adfcc1da4aac9766274275460fe2252bd9ffe4eb
tree	9e4e7227f5f076f322990ee1c2e25fc8491d3eca	tree \| snapshot
parent	e6590efaa77c8cf186ce92e6ebad175e9c6450d1	commit \| diff
parent	3d5154550c92766347631e4d15fae825a0f165dd	commit \| diff

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

Conflicts:
src/or/microdesc.c

Conflict because one change was on line adjacent to line where
01206893 got fixed.

src/or/dirvote.c	diff1 \|	diff2 \|	blob \| history
src/or/microdesc.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

src/or/dirvote.c	diff1 \|	diff2 \|	blob \| history
src/or/microdesc.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history