Nick Mathewson f42dbc4e26 Merge branch 'maint-0.2.8'		2016-06-28 19:15:43 -04:00
..
common	Merge branch 'maint-0.2.8'	2016-06-27 13:17:42 -04:00
config	Merge branch 'maint-0.2.8'	2016-06-13 10:49:24 -04:00
ext	Use the Autoconf macro AC_USE_SYSTEM_EXTENSIONS	2016-06-17 10:17:44 -04:00
or	Merge branch 'maint-0.2.8'	2016-06-28 19:15:43 -04:00
test	Merge remote-tracking branch 'public/bug15942_v2_alternative'	2016-06-23 09:01:24 -04:00
tools	Merge branch 'maint-0.2.8'	2016-06-27 13:17:42 -04:00
trunnel	Update to trunnel 1.4.4 to fix 18373	2016-02-22 14:19:29 -05:00
win32	Bump to 0.2.8.4-rc-dev	2016-06-15 12:55:17 -04:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00