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

Conflicts:
	src/or/buffers.c

2010-11-15 15:37:23 -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

…

bufferevent-support

…

bug507.event

Stop linking src/tools/* against libevent

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

bug1125

Add changes file for bug1125

2010-11-12 13:03:18 -05:00

bug1982

…

bug2000

Rate-limit unsafe socks warning

2010-11-15 13:57:37 -05:00

bug2050

let unpublished bridges learn their ip address too

2010-11-11 11:26:42 -05:00

cpudetect

…

enhancement1668

Make logging resolution configurable.

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

enhancement1883

Add GeoIP file digest to extra-info descriptor.

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

eventdns_routerinfo_key

…

HTTP

Synx manpage and source wrt option capitalization

2010-11-10 15:48:26 +01:00

microdesc_dl

…

minuptimehs

Document hs dht min uptime change in privnets

2010-11-10 15:48:26 +01:00

nodelist

Initial conversion to use node_t throughout our codebase.

2010-10-01 18:14:27 -04:00

nonopublish

changes entry for nopublish removal in 5040c855d

2010-11-15 14:29:53 -05:00

remove_osx_expert

Remove everything related to os x expert package

2010-11-10 04:04:29 +01:00

tor-fw-helper

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

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

torrc.complete

Remove the torrc.complete file.

2010-11-10 15:48:25 +01:00