Nick Mathewson 9c66afe772 Merge branch 'maint-0.2.6' into maint-0.2.7		2015-12-07 10:11:21 -05:00
..
common	Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7	2015-10-21 12:02:42 -04:00
config	Merge branch 'maint-0.2.6' into maint-0.2.7	2015-12-07 10:11:21 -05:00
ext	Don't enable SSE2 on X86-64.	2015-09-16 14:08:38 +02:00
or	Fix undefined behavior caused by memory overlap	2015-11-30 22:02:22 -05:00
test	Make get_ifaddrs tests more tolerant of unusual network configs	2015-10-07 15:20:31 -04:00
tools	Remove -F from tor-resolve(1) usage message.	2015-08-30 21:57:24 +03:00
trunnel	Update to latest trunnel	2015-08-18 09:47:36 -04:00
win32	bump version to 0.2.7-dev	2015-11-20 10:27:35 -05:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00