Nick Mathewson 7f074e08d8 Merge branch 'feature13696_squashed'		2015-12-08 12:35:26 -05:00
..
common	Merge branch 'feature13696_squashed'	2015-12-08 12:35:26 -05:00
config	Merge branch 'maint-0.2.6' into maint-0.2.7	2015-12-07 10:11:21 -05:00
ext	Fix SipHash-2-4 performance for non multiple of 8 buffers.	2015-11-05 18:21:43 +00:00
or	Merge branch 'maint-0.2.7'	2015-12-08 10:23:56 -05:00
test	Fix memory leak in ntor test	2015-12-08 08:28:27 -05:00
tools	Remove -F from tor-resolve(1) usage message.	2015-08-30 21:57:24 +03:00
trunnel	Mention trunnel in CodingStandards; describe how in trunnel/README	2015-10-14 10:40:27 -04:00
win32	bump version to 0.2.7-dev	2015-11-20 10:27:35 -05:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00