Nick Mathewson 3fa9151f26 Merge branch 'win64-7260' ... Conflicts: src/or/dns.c		2012-12-07 14:12:17 -05:00
..
addrmap_error	Make sure that the error in ADDRMAP events is well-formed	2012-11-23 11:36:44 -05:00
bug3443	Bug 3443: Don't count ORconn setup in circuit build time.	2012-12-07 10:34:09 -05:00
bug6113	In comments and logs, say "UTC" not "GMT"	2012-11-23 10:05:16 -05:00
bug6887	Remove some deadcode for parsing v1 directories	2012-09-18 15:30:27 -04:00
bug7013	Add a torrc option to specify the bind address of managed proxies.	2012-11-27 22:18:08 -05:00
bug7059a	Allow an optional $ in GETINFO ns/id/<identity>	2012-11-04 22:12:11 -05:00
bug7260	In the unit tests, use "test_eq_ptr" and "test_neq_ptr" consistently	2012-11-02 14:32:05 -04:00
bug7267	Add changes file for bug 7267	2012-11-13 13:46:36 -08:00
bug7306	Use FreeLibrary, not CloseHandle, for library in test_util.c	2012-12-06 10:59:02 -05:00
dist-geoip6	Actually distribute the geoip6 file.	2012-11-13 21:24:28 -05:00
geoip-dec2012	Update to the December 2012 GeoIP database.	2012-12-06 11:29:47 +01:00
geoip-nov2012	Update to the November 2012 GeoIP database.	2012-11-27 21:26:52 -05:00
ipv6_exits	Add a changes file for IPv6 exits	2012-11-14 23:35:55 -05:00
split_addressmap	Move address map into its own file.	2012-11-14 23:16:20 -05:00
task-6266	Add script to fix "A1" entries in geoip file.	2012-11-27 21:24:07 -05:00