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: 0989ba3 5eb584e)

author	Nick Mathewson <nickm@torproject.org>
	Thu, 28 May 2015 15:04:33 +0000 (11:04 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Thu, 28 May 2015 15:04:33 +0000 (11:04 -0400)
commit	1b52e95028e0d84b7a112e4b8f2e393261dbb19c
tree	3dba31b96e31d4c9816a2f124afc5ff2152af2c8	tree \| snapshot
parent	0989ba33834c17b2eac3bb87596fca115965ce3c	commit \| diff
parent	5eb584e2e91bd5d6d204b9bb62a95c0edf43ff71	commit \| diff

Merge branch '12498_ed25519_keys_v6'

Fixed numerous conflicts, and ported code to use new base64 api.

26 files changed:

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/common/container.h	diff1 \|	diff2 \|	blob \| history
src/common/crypto.c	diff1 \|	diff2 \|	blob \| history
src/common/crypto.h	diff1 \|	diff2 \|	blob \| history
src/common/crypto_format.c	diff1 \|	diff2 \|	blob \| history
src/common/tortls.c	diff1 \|	diff2 \|	blob \| history
src/common/tortls.h	diff1 \|	diff2 \|	blob \| history
src/or/channeltls.c	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/config.h	diff1 \|	diff2 \|	blob \| history
src/or/connection_or.c	diff1 \|	diff2 \|	blob \| history
src/or/dirserv.c	diff1 \|	diff2 \|	blob \| history
src/or/dirvote.c	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/router.c	diff1 \|	diff2 \|	blob \| history
src/or/router.h	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.h	diff1 \|	diff2 \|	blob \| history
src/test/include.am	diff1 \|	diff2 \|	blob \| history
src/test/test.c	diff1 \|	diff2 \|	blob \| history
src/test/test_crypto.c	diff1 \|	diff2 \|	blob \| history
src/test/test_dir.c	diff1 \|	diff2 \|	blob \| history
src/trunnel/include.am	diff1 \|	diff2 \|	blob \| history

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