Nick Mathewson 7c3f210e70 Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7		2015-10-09 10:14:59 -04:00
..
.dummy	Add a .dummy file in the changes directory to stop git from removing it	2015-05-11 11:41:48 -04:00
bug15609	Socks->SOCKS in torrcs. Fixes 15609	2015-09-29 10:20:31 +02:00
bug17151	Add changes file for bug17151	2015-09-29 10:08:02 +02:00
bug17154	Changes file for bug17154	2015-09-29 10:10:52 +02:00
bug17173-socket-hack-rv	Add checks and unit tests for get_interface_address* failure	2015-09-29 10:17:05 +02:00
bug17237_027	Work around openssl declaring x509_get_not{Before,After} as functions	2015-10-06 09:04:37 -04:00
bug17251	Fix 17251: avoid integer overflow in test_crypto_slow	2015-10-06 08:58:03 -04:00
geoip-october2015	Update geoip and geoip6 to the October 9 2015 database.	2015-10-09 15:27:55 +02:00
ifaddrs-tests-network-configs	Make get_ifaddrs tests more tolerant of unusual network configs	2015-10-07 15:20:31 -04:00