Nick Mathewson 2db858ef61 Merge remote-tracking branch 'jryans/dependant-corrected'		2017-01-11 09:28:54 -05:00
..
common	Merge remote-tracking branch 'public/ticket21037'	2017-01-11 09:17:21 -05:00
config	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-01-11 09:13:34 -05:00
ext	Update to trunnel 1.5.1	2016-12-08 16:59:25 -05:00
or	Merge remote-tracking branch 'jryans/dependant-corrected'	2017-01-11 09:28:54 -05:00
test	fixup! Fix unit test failures in response to DNS hijacking.	2017-01-04 09:03:41 -05:00
tools	Revert ticket 20982 changes.	2016-12-18 10:04:36 -05:00
trunnel	trunnel: Move ESTABLISH_INTRO cell sig_len after the end_sig_fields	2016-12-16 12:21:07 -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