]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b27f5cc 50b06a2)
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Sat, 15 Jan 2011 17:02:55 +0000 (12:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 15 Jan 2011 17:02:55 +0000 (12:02 -0500)
commited87738ede789fb9eccfd2e5a34bd8c484dfe44e
tree27eb5efade75d368692a80d258615415deb8a7dctree | snapshot
parentb27f5cc50d4a66bff31e43a596eb296a1b5a11dccommit | diff
parent50b06a2b76190170e9f80739f022696755b54b99commit | diff
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
src/or/config.c
src/or/networkstatus.c
src/or/rendcommon.c
src/or/routerparse.c
src/or/test.c
src/common/crypto.c diff1 | diff2 | blob | history
src/common/crypto.h diff1 | diff2 | blob | history
src/or/config.c diff1 | diff2 | blob | history
src/or/dnsserv.c diff1 | diff2 | blob | history
src/or/networkstatus.c diff1 | diff2 | blob | history
src/or/onion.c diff1 | diff2 | blob | history
src/or/rendclient.c diff1 | diff2 | blob | history
src/or/rendservice.c diff1 | diff2 | blob | history
src/or/routerlist.c diff1 | diff2 | blob | history
src/or/routerparse.c diff1 | diff2 | blob | history
src/test/test_crypto.c diff1 | | blob | history
Mirror of https://git.torproject.org/tor.git