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: c6ea014 dfa6cde)

author	Nick Mathewson <nickm@torproject.org>
	Wed, 7 Sep 2011 18:51:55 +0000 (14:51 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Wed, 7 Sep 2011 18:51:55 +0000 (14:51 -0400)
commit	41eef6680e814f453cc8eedff415e941429aa627
tree	7d2ac796e36d7c5786289a6093a98c66c36dbaad	tree \| snapshot
parent	c6ea014b5978a020ca4472345216ba29584db5a9	commit \| diff
parent	dfa6cde4d4de57476ea8381199dfbac1afc245d5	commit \| diff

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

Conflicts:
src/or/dirserv.c
src/or/networkstatus.c

Conflicts were related to routerinfo->node shift.

doc/tor.1.txt	diff1 \|	diff2 \|	blob \| history
src/or/config.c	diff1 \|	diff2 \|	blob \| history
src/or/dirserv.c	diff1 \|	diff2 \|	blob \| history
src/or/dirvote.h	diff1 \|	diff2 \|	blob \| history
src/or/networkstatus.c	diff1 \|	diff2 \|	blob \| history
src/or/or.h	diff1 \|	diff2 \|	blob \| history

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