Nick Mathewson 7fe80c2905 Merge branch 'maint-0.2.6' into maint-0.2.7 %!s(int64=8) %!d(string=hai) anos
..
common 725e0c76e3 Permit setrlimit, prlimit, prlimit64 calls. %!s(int64=8) %!d(string=hai) anos
config 7fe80c2905 Merge branch 'maint-0.2.6' into maint-0.2.7 %!s(int64=8) %!d(string=hai) anos
ext 98da122ab4 Don't enable SSE2 on X86-64. %!s(int64=8) %!d(string=hai) anos
or 0b45cab147 Merge branch 'bug18570_027' into maint-0.2.7 %!s(int64=8) %!d(string=hai) anos
test 1a065cea46 Do not link tests against both libor.a and libor-testing.a %!s(int64=8) %!d(string=hai) anos
tools 54565ca804 Remove -F from tor-resolve(1) usage message. %!s(int64=8) %!d(string=hai) anos
trunnel 988d208814 Update to latest trunnel %!s(int64=8) %!d(string=hai) anos
win32 aa40f28962 bump to 0.2.7.6-dev %!s(int64=8) %!d(string=hai) anos
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. %!s(int64=9) %!d(string=hai) anos