Nick Mathewson a7d44731d9 Merge remote-tracking branch 'teor/feature4483-v10-squashed'		2015-12-15 12:57:57 -05:00
..
common	Merge remote-tracking branch 'teor/feature4483-v10-squashed'	2015-12-15 12:57:57 -05:00
config	Merge branch 'maint-0.2.6' into maint-0.2.7	2015-12-07 10:11:21 -05:00
ext	Replace usage of INLINE with inline	2015-12-15 11:34:00 -05:00
or	Merge remote-tracking branch 'teor/feature4483-v10-squashed'	2015-12-15 12:57:57 -05:00
test	Merge remote-tracking branch 'teor/feature4483-v10-squashed'	2015-12-15 12:57:57 -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 to 0.2.7.6-dev	2015-12-10 14:24:55 -05:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00