Nick Mathewson 9fb2bf2f3f Merge remote-tracking branch 'dgoulet/bug19899_030_01'		2016-12-23 08:28:05 -05:00
..
common	Merge branch 'maint-0.2.9'	2016-12-23 08:06:19 -05:00
config	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-12-09 08:34:24 -05:00
ext	Update to trunnel 1.5.1	2016-12-08 16:59:25 -05:00
or	Merge remote-tracking branch 'dgoulet/bug19899_030_01'	2016-12-23 08:28:05 -05:00
test	Fix another pointless stack-protector warning.	2016-12-16 14:06:25 -05:00
tools	Revert ticket 20982 changes.	2016-12-18 10:04:36 -05:00
trunnel	Update to trunnel 1.5.1	2016-12-08 16:59:25 -05:00
win32	bump to 0.3.0.1-alpha-dev	2016-12-19 14:24:38 -05:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00