Nick Mathewson c5c4ea2db0 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6

2015-03-04 12:19:28 +01:00

..

common

Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6

2015-03-04 12:19:28 +01:00

config

Merge remote-tracking branch 'origin/maint-0.2.5'

2015-01-23 08:53:21 -05:00

ext

Have tinytest tolerate systems where char has > 8 bytes

2015-02-17 08:40:55 -05:00

or

Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6

2015-03-04 12:14:17 +01:00

test

Have zero_length_keys.sh use an empty torrc file.

2015-02-26 15:22:37 -05:00

tools

Tweak tor-resolve docs and logs

2015-01-28 10:11:08 -05:00

trunnel

Regenerate pwbox.c with the latest trunnel

2014-09-26 09:33:24 -04:00

win32

bump version to 0.2.6.3-alpha-dev

2015-02-19 17:20:40 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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