diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-14 16:34:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-14 16:34:33 -0400 |
| commit | e91a8c5589be1f562563a73c6e866a3b84afee87 (patch) | |
| tree | 98df41dbc7dfe797cf47c583c6869c8e7decdc0d /src/or/nodelist.h | |
| parent | f1c365b032e058e7342b632006435ecc175475a3 (diff) | |
| parent | 0588330c1d66960353c412812d1d073fdb37e310 (diff) | |
| download | tor-e91a8c5589be1f562563a73c6e866a3b84afee87.tar.gz tor-e91a8c5589be1f562563a73c6e866a3b84afee87.zip | |
Merge remote branch 'origin/maint-0.2.2'
Resolved nontrivial conflict around rewrite_x_address_for_bridge and
learned_bridge_descriptor. Now, since leanred_bridge_descriptor works
on nodes, we must make sure that rewrite_node_address_for_bridge also
works on nodes.
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/nodelist.h')
0 files changed, 0 insertions, 0 deletions