Nick Mathewson 488e9a0502 Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals' ...

(Minor conflicts)

2015-10-02 13:54:20 +02:00

..

common

Fix check-spaces complaints

2015-10-02 13:22:00 +02:00

config

Socks->SOCKS in torrcs. Fixes 15609

2015-09-29 10:20:31 +02:00

ext

Don't enable SSE2 on X86-64.

2015-09-16 14:08:38 +02:00

or

Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'

2015-10-02 13:54:20 +02:00

test

Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'

2015-10-02 13:54:20 +02:00

tools

Remove -F from tor-resolve(1) usage message.

2015-08-30 21:57:24 +03:00

trunnel

Add a README for the trunnel directory

2015-09-29 13:43:12 +02:00

win32

Bump master to 0.2.8.0-alpha-dev

2015-09-25 09:27:39 -04:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

2014-09-25 11:58:14 -04:00