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: 9f3f537 9ad4776)

author	Nick Mathewson <nickm@torproject.org>
	Thu, 8 Nov 2012 21:48:04 +0000 (16:48 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 8 Nov 2012 21:48:04 +0000 (16:48 -0500)
commit	81deddb08c6b8bf644f663dcdc31720e365f68dc
tree	9e67efdfb4451dcc169727dc0e64f8f5bfca95b8	tree \| snapshot
parent	9f3f5372b880b3372fd7b9fc98bd3d78f969390a	commit \| diff
parent	9ad4776e6150a29fdfff607721599eb04c6e76d7	commit \| diff

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

Conflicts:
src/common/crypto.c
src/or/rendservice.c

18 files changed:

src/common/aes.c	diff1 \|	diff2 \|	blob \| history
src/common/compat.c	diff1 \|	diff2 \|	blob \| history
src/common/crypto.c	diff1 \|	diff2 \|	blob \| history
src/common/crypto.h	diff1 \|	diff2 \|	blob \| history
src/common/mempool.c	diff1 \|	diff2 \|	blob \| history
src/common/tortls.c	diff1 \|	diff2 \|	blob \| history
src/common/util.c	diff1 \|	diff2 \|	blob \| history
src/or/buffers.c	diff1 \|	diff2 \|	blob \| history
src/or/circuitlist.c	diff1 \|	diff2 \|	blob \| history
src/or/connection.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_edge.c	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.c	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.c	diff1 \|	diff2 \|	blob \| history
src/or/onion.c	diff1 \|	diff2 \|	blob \| history
src/or/rendclient.c	diff1 \|	diff2 \|	blob \| history
src/or/rendservice.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history
src/tools/tor-gencert.c	diff1 \|	diff2 \|	blob \| history

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