Nick Mathewson 57ff9913b2 Merge remote-tracking branch 'origin/maint-0.2.2' ... Conflicts: src/or/connection_or.c The conflict in src/or/connection_or.c is resolved by taking the version in master, since e27a26d5 already fixed bug 4531 on master. This merge just adds the changes file from 0.2.2.		2011-12-02 16:17:52 -05:00
..
bug933	bug933 - Match against super-domains in MapAddress	2011-11-30 14:08:10 -05:00
bug3448	Resolve bug 3448: remove mention of tor-ops (which is not in use)	2011-12-02 15:42:15 -05:00
bug3460	Ignore timestamps of INTRODUCE2 cells	2011-10-31 05:05:45 -07:00
bug3786	Add changes file.	2011-11-30 11:55:46 -05:00
bug4529	Detect tor_addr_to_str failure in tor_dup_addr.	2011-11-23 23:04:10 -05:00
bug4530	Fix bug 4530; check return val of tor_addr_lookup correctly	2011-12-02 15:37:24 -05:00
bug4531	Don't call tor_tls_set_logged_address till after checking conn->tls	2011-12-02 16:15:52 -05:00
bug4535	tor_accept_socket() should take tor_addr_t for listener arg	2011-12-02 16:09:16 -05:00
bug4548	Add a changes file.	2011-11-25 17:44:48 +01:00
bug4584	Add a changes file.	2011-11-27 09:03:37 +01:00
config	Support for a defaults torrc file.	2011-11-27 22:25:52 -05:00
disable_network	New 'DisableNetwork' option to prevent Tor from using the network	2011-11-28 15:44:10 -05:00
intro-point-expiration	Make introduction points expire	2011-10-30 02:17:59 -07:00
per-intro-point-replay-cache	Move the real INTRODUCE2 replay-detection cache into rend_intro_point_t	2011-10-30 04:46:58 -07:00
proposal178	Implement consensus method 12 (proposal 178)	2011-11-27 09:29:33 -05:00
reduce-hs-intro-dh-key-replay-cache-lifetime	Reduce lifetime of DH public key replay-detection cache elements	2011-10-31 05:05:45 -07:00