]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Wed, 28 Dec 2011 21:52:31 +0000 (16:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 28 Dec 2011 21:52:31 +0000 (16:52 -0500)
commitbfae41328e9bbd29a3c3df2cd6b7c5d0caf83ada
tree6e978afee8ad5c07ad208635acbde4c0809dc502
parentf71d63ec9d331bb6c942ada160244ede4d9c26fc
parent84bf8e3808d5f10e5ffd0d9f9f31760c6d3875ab
Merge remote-tracking branch 'origin/maint-0.2.2'
src/or/dirserv.c