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

Conflicts:
	src/or/main.c
	src/or/microdesc.c

2011-05-03 17:30:58 -04: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

bug507.event

Stop linking src/tools/* against libevent

2010-11-11 23:50:33 -05:00

bug1982

allow countries and IP addresses in EntryNodes

2010-09-29 03:00:06 -04:00

bug2230_part1

Add missing code to set cache->journal_len when reading microdesc journal

2011-05-03 16:22:31 -04:00

bug2230_part2

Fix a check for when to rebuild the microdesc cache. (Backport from 0.2.3.

2011-05-03 16:29:39 -04:00

bug2230_part4

Change who calls microdesc_cache_rebuild().

2011-05-03 17:28:28 -04:00

bug2444

Log which config file we read

2011-01-27 15:31:34 +01:00

bug2559

Tweaks to Cagara's CountPrivateBandwidth patch:

2011-04-05 16:24:42 -04:00

bug2573

oops. I got the bug number wrong.

2011-03-09 16:22:18 -05:00

bug2702

Small fixes for the 2702 implementation

2011-04-02 12:15:08 +02:00

cpudetect

Autodetect the number of CPUs when possible if NumCPUs==0

2010-09-28 14:42:21 -04:00

dirreq-stats-default

Turn on directory request statistics by default.

2010-11-10 12:11:08 +01:00

enhancement1668

Make logging resolution configurable.

2010-10-04 08:15:18 +02:00

enhancement1819

Add ChangeLog entry and man page entry.

2010-12-03 16:47:52 +01:00

enhancement1883

Add GeoIP file digest to extra-info descriptor.

2010-11-09 09:42:36 +01:00

eventdns_routerinfo_key

Remove the has_old_dnsworkers flag.

2010-09-28 23:37:45 -04:00

feature1955

Add a changes file for SIGNAL events

2010-11-19 15:54:02 -05:00

feature2345

GETINFO options for querying traffic usage

2011-01-07 12:15:14 -05:00

getinfo_process

Tweak GETINFO process/* code: no need to print an int as anything other than %d

2011-01-03 12:11:09 -05:00

heartbeat

Add a changes file for the heartbeat code

2011-02-22 12:41:22 -05:00

install-fix

Correct a broken faq link in the INSTALL file

2010-12-22 00:54:29 -05: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

prop174_server

Add changes file for server-side optimistic data patch

2011-03-14 18:25:20 -04:00

tls-hash

Emend changes/tls-hash

2011-03-03 17:54:53 -08:00

tor-fw-helper

Changes to tor-fw-helper, some based on Nick's review

2010-09-30 11:39:34 -04:00