Nick Mathewson a48ae2aa67 Merge branch 'maint-0.2.6' into maint-0.2.7-redux		2017-08-01 11:19:29 -04:00
..
common	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-07-05 13:42:37 -04:00
config	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-08-01 11:19:29 -04:00
ext	Don't enable SSE2 on X86-64.	2015-09-16 14:08:38 +02:00
or	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-06-27 11:04:44 -04:00
test	Merge branch 'maint-0.2.6' into maint-0.2.7-redux	2017-07-05 13:42:37 -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	Add -dev to version number.	2017-06-08 14:05:18 -04:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00