Nick Mathewson f2445fc608 Merge branch 'maint-0.2.9'		2016-12-09 08:34:30 -05:00
..
common	whitespace cleanups	2016-12-08 16:53:29 -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 branch 'maint-0.2.9'	2016-12-09 08:30:55 -05:00
test	Fix a completely stupid stack-protector warning in test_channels.c	2016-12-08 17:50:01 -05:00
tools	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-11-03 15:41:04 -04:00
trunnel	Update to trunnel 1.5.1	2016-12-08 16:59:25 -05:00
win32	Bump to 0.2.8.11-dev	2016-12-08 11:02:49 -05:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00