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

Resolved trivial one-line conflicts.

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

2011-03-08 16:10:40 -05:00

..

1863_bwhist

Add Maxima lists to bandwidth state.

2011-01-10 14:47:39 -05:00

all_descs

changes file for careful_with_all_descs

2011-03-06 13:35:24 -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

bug507.event

Stop linking src/tools/* against libevent

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

bug1035

Routers count as down when they change ORPort, too

2011-02-08 00:38:48 +01:00

bug1982

allow countries and IP addresses in EntryNodes

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

bug2366

Don't let bad DNS make exit policy and declared exit policy get out of sync

2011-02-22 14:06:28 -05:00

bug2403

prevent same entry and exit for insane edge case

2011-02-22 17:54:25 -05:00

bug2444

Log which config file we read

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

bug2504

Windows has EACCES, not EACCESS

2011-02-11 17:02:26 +01:00

bug2572

Don't crash a bridge authority on SIGHUP if it's not in the consensus

2011-02-16 04:12:37 -08:00

bug2629

Avoid crash in any_pending_bridge_descriptor_fetches

2011-03-08 15:17:41 -05:00

bug2660

Fix setting target port in get_interface_address6

2011-03-05 16:58:20 +01: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

ipv6_crash

Oops, here's the *REAL* fix for the ipv6 issue

2011-03-06 13:41:55 -05:00

log_domains

Add a torrc option to report log domains

2011-01-25 15:53:15 -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

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

torspec.git

changes file for removing torspec from the tarball

2011-02-22 15:58:19 -05:00