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

Conflicts:
	src/or/dirserv.c
	src/or/networkstatus.c

Conflicts were related to routerinfo->node shift.

2011-09-07 14:51:55 -04:00

..

bug2649a

Add a VoteOnHidServDirectoriesV2 configuration option

2011-06-03 12:16:55 -04:00

bug2649b

Increase default required uptime for HSDirs to 25 hours

2011-06-03 12:17:53 -04:00

bug3428b

Die if tor_vasprintf fails in connection_printf_to_buf

2011-09-07 12:14:58 -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

split_entry_conn

changes file for split_entry_conn (ticket 3627)

2011-09-07 14:18:47 -04:00