Public Git Hosting - tor.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 1295490 74e6a47)

commit	f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde
author	Nick Mathewson <nickm@torproject.org>
	Wed, 5 Mar 2014 17:44:40 +0000 (5 12:44 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 5 Mar 2014 17:44:40 +0000 (5 12:44 -0500)
tree	ee8e9b36590f7cb2f349aa25eeb1abd33e20a7b1	tree \| snapshot (tar.gz zip)
parent	12954908623a285606ec7522168cd2ac7e799525	commit \| diff
parent	74e6a47a808803c985f55b626dff294dbe425043	commit \| diff

Merge remote-tracking branch 'arma/ticket5528'

Conflicts:
src/or/router.c
src/test/test_dir.c

15 files changed:

src/or/circuitbuild.c	diff1 \|	diff2 \|	blob \| history
src/or/directory.c	diff1 \|	diff2 \|	blob \| history
src/or/directory.h	diff1 \|	diff2 \|	blob \| history
src/or/dirserv.c	diff1 \|	diff2 \|	blob \| history
src/or/entrynodes.c	diff1 \|	diff2 \|	blob \| history
src/or/main.c	diff1 \|	diff2 \|	blob \| history
src/or/nodelist.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history
src/or/policies.c	diff1 \|	diff2 \|	blob \| history
src/or/policies.h	diff1 \|	diff2 \|	blob \| history
src/or/router.c	diff1 \|	diff2 \|	blob \| history
src/or/routerlist.c	diff1 \|	diff2 \|	blob \| history
src/or/routerparse.c	diff1 \|	diff2 \|	blob \| history
src/test/test.c	diff1 \|	diff2 \|	blob \| history
src/test/test_dir.c	diff1 \|	diff2 \|	blob \| history

The Onion Router