Nick Mathewson b70a0a4375 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	configure.in

Conflict was between two pieces of configure.in logic added to the
same place.  Trivial.

2011-09-07 12:11:35 -04:00

..

bug3851

Make FetchUselessDescriptors fetch all desc types

2011-08-29 11:18:06 -04:00

bug3909

Look for correct "ar" to cross-compile

2011-09-07 11:59:16 -04:00

bug3923

Fix assertion in addressmap_clear_excluded_trackexithosts

2011-09-06 20:26:20 -04:00