Files
tor/changes
Nick Mathewson e91a8c5589 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
2011-03-14 16:34:33 -04:00
..
2011-03-01 10:05:18 +01:00
2011-01-27 15:31:34 +01:00
2011-02-11 17:02:26 +01:00
2011-02-08 09:10:14 -05:00
2011-03-09 16:22:18 -05:00
2011-03-08 18:15:17 -05:00
2011-03-03 17:54:53 -08:00