Roger Dingledine a29596556c Merge branch 'maint-0.2.2' ... Conflicts: src/or/config.c		2010-11-11 12:19:37 -05:00
..
annotations_fix	Enforce multiplicity rules when parsing annotations.	2010-11-10 16:02:02 -05:00
automake_required	The build stuff for tor-fw-helper means we need automake 1.6 or later	2010-10-01 00:01:08 -04:00
autoreconf	Use autoreconf, not autoconf&&automake&&etc in autogen.sh	2010-09-27 11:20:12 -04:00
bufferevent-support	Add a new option to enable/disable IOCP support	2010-09-28 14:01:45 -04:00
bug1982	allow countries and IP addresses in EntryNodes	2010-09-29 03:00:06 -04:00
bug2050	let unpublished bridges learn their ip address too	2010-11-11 11:26:42 -05:00
cpudetect	Autodetect the number of CPUs when possible if NumCPUs==0	2010-09-28 14:42:21 -04:00
enhancement1668	Make logging resolution configurable.	2010-10-04 08:15:18 +02:00
eventdns_routerinfo_key	Remove the has_old_dnsworkers flag.	2010-09-28 23:37:45 -04:00
microdesc_dl	Code to download, parse, and store microdesc consensuses	2010-09-27 18:04:43 -04:00
nodelist	Initial conversion to use node_t throughout our codebase.	2010-10-01 18:14:27 -04:00
tor-fw-helper	Changes to tor-fw-helper, some based on Nick's review	2010-09-30 11:39:34 -04:00