]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 18 Apr 2013 15:16:05 +0000 (11:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 18 Apr 2013 15:16:05 +0000 (11:16 -0400)
commitda30adcf0fd048d1f2e7a4b76e2c880cc3824e6e
treeeef8ad038eb361e3241c3b8f9997478c8522ce55
parent5f035e2c6501fe166900cb493e2c3de51371c9c5
parent9fec0c1a95ab24f5f18d6995e30fe2111e6b7db2
Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
src/common/crypto.c
src/common/crypto.c
src/common/crypto.h
src/or/dirserv.c
src/or/or.h
src/test/test.c