Nick Mathewson a7762930c3 Merge remote-tracking branch 'dgoulet/ticket20568_030_01'

2016-12-01 09:23:36 -05:00

..

common

Merge remote-tracking branch 'teor/fix-mingw-pagesize'

2016-11-22 18:29:50 -05:00

config

In torrc.sample.in, note that bandwidth must be >=75 KB.

2016-11-08 19:23:49 -05:00

ext

Regenerate trunnel code with trunnel 1.5

2016-10-26 11:06:45 -04:00

or

Merge remote-tracking branch 'dgoulet/ticket20568_030_01'

2016-12-01 09:23:36 -05:00

test

Merge remote-tracking branch 'dgoulet/ticket20568_030_01'

2016-12-01 09:23:36 -05:00

tools

Merge branch 'maint-0.2.8' into maint-0.2.9

2016-11-03 15:41:04 -04:00

trunnel

Merge branch 'ticket17238_029_02-resquash'

2016-11-04 13:26:37 -04:00

win32

Bump version to 0.2.9.5-alpha-dev

2016-11-08 07:55:15 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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