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

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

projects / thirdparty / tor.git / commit

author	teor <teor2345@gmail.com>
	Sat, 10 Jan 2015 06:20:06 +0000 (17:20 +1100)
committer	teor <teor2345@gmail.com>
	Sat, 10 Jan 2015 06:20:06 +0000 (17:20 +1100)
commit	f8ffb57bc4430ff9bbd7560eecdda4284b2799ba
tree	7b73b0bf39d756c31bb62dbcd3c239864a6a46c8	tree \| snapshot
parent	debd7862bb6d641c13fe4ee019da633c683d740e	commit \| diff
parent	33df3e37ffecfed309a1a0f210a96620c0ebb837	commit \| diff

Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty

Conflicts:
src/or/connection_edge.c
Merged in favour of origin.

src/common/compat.c	diff1 \|	diff2 \|	blob \| history
src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/common/util.h	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/router.c	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.c	diff1 \|	diff2 \|	blob \| history
src/or/statefile.c	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

src/common/compat.c	diff1 \|	diff2 \|	blob \| history
src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/common/util.h	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/router.c	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.c	diff1 \|	diff2 \|	blob \| history
src/or/statefile.c	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history