diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
| commit | fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3 (patch) | |
| tree | b80ab67323274c8ae1e2f8097278e923c5d5d243 /changes/bug3026 | |
| parent | 21de9d46e264ceb14f3fe59d17210d82f2499637 (diff) | |
| parent | 7f0fb8e6083128ff20b30d8cd29c220e9427d95e (diff) | |
| download | tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.tar.gz tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.zip | |
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
Diffstat (limited to 'changes/bug3026')
0 files changed, 0 insertions, 0 deletions