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

..

common

Merge remote branch 'origin/maint-0.2.2'

2011-03-07 17:12:08 -05:00

config

Merge branch 'maint-0.2.1' into maint-0.2.2

2011-03-08 18:16:06 -05:00

or

Merge remote branch 'origin/maint-0.2.2'

2011-03-14 16:34:33 -04:00

test

Merge remote branch 'origin/maint-0.2.2'

2011-01-24 17:51:52 -05:00

tools

Bump copyright statements to 2011 (master)

2011-01-03 11:55:01 -05:00

win32

bump to 0.2.2.19-alpha

2010-11-21 18:00:12 -05:00

Makefile.am

Move testing code into new src/test directory.

2009-09-23 00:24:43 -04:00