]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21de9d4 7f0fb8e)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 19:41:46 +0000 (15:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 19:41:46 +0000 (15:41 -0400)
commitfa1d47293b62fd378a7e43cf3ce3e7bb3be884e3
treeb80ab67323274c8ae1e2f8097278e923c5d5d243tree | snapshot
parent21de9d46e264ceb14f3fe59d17210d82f2499637commit | diff
parent7f0fb8e6083128ff20b30d8cd29c220e9427d95ecommit | diff
Merge remote-tracking branch 'origin/maint-0.2.2'

The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
src/or/circuitbuild.c
src/or/command.c
src/or/connection_edge.c
src/or/directory.c
src/or/dirserv.c
src/or/relay.c
src/or/rendservice.c
src/or/routerlist.c
18 files changed:
src/common/compat_libevent.h diff1 | diff2 | blob | history
src/common/util.h diff1 | diff2 | blob | history
src/or/circuitbuild.c diff1 | diff2 | blob | history
src/or/circuitlist.c diff1 | diff2 | blob | history
src/or/circuituse.c diff1 | diff2 | blob | history
src/or/command.c diff1 | diff2 | blob | history
src/or/connection_edge.c diff1 | diff2 | blob | history
src/or/directory.c diff1 | diff2 | blob | history
src/or/dirserv.c diff1 | diff2 | blob | history
src/or/relay.c diff1 | diff2 | blob | history
src/or/rendclient.c diff1 | diff2 | blob | history
src/or/rendservice.c diff1 | diff2 | blob | history
src/or/rephist.c diff1 | diff2 | blob | history
src/or/router.c diff1 | diff2 | blob | history
src/or/router.h diff1 | diff2 | blob | history
src/or/routerlist.c diff1 | diff2 | blob | history
src/or/routerlist.h diff1 | diff2 | blob | history
src/or/routerparse.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git