Nick Mathewson df0b4f0342 Merge branch 'feature16769_squashed'		2015-09-22 09:26:30 -04:00
..
common	Merge remote-tracking branch 'public/bug17047'	2015-09-16 08:46:13 -04:00
config	Update private ExitPolicy in man page and torrcs for 10727, formatting	2015-09-22 12:14:27 +10:00
ext	Don't enable SSE2 on X86-64.	2015-09-16 14:08:38 +02:00
or	Merge branch 'feature16769_squashed'	2015-09-22 09:26:30 -04:00
test	Merge branch 'bug17027-reject-private-all-interfaces-v2' into bug16069-bug17027	2015-09-16 09:09:54 +10:00
tools	Remove -F from tor-resolve(1) usage message.	2015-08-30 21:57:24 +03:00
trunnel	Update to latest trunnel	2015-08-18 09:47:36 -04:00
win32	Bump version to 0.2.7.2-alpha-dev	2015-07-27 13:59:49 -04:00
include.am	Use trunnel for crypto_pwbox encoding/decoding.	2014-09-25 11:58:14 -04:00