Nick Mathewson 55639bc67f Merge remote-tracking branch 'dgoulet/bug14202_026_v1'

2015-02-02 10:16:48 -05:00

..

common

Merge remote-tracking branch 'public/14188_part1'

2015-02-02 10:15:26 -05:00

config

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

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

ext

Use HT_BUCKET_NUM_ in more places

2015-01-29 15:10:23 -05:00

or

Merge remote-tracking branch 'dgoulet/bug14202_026_v1'

2015-02-02 10:16:48 -05:00

test

Merge remote-tracking branch 'public/prop227_v2'

2015-01-30 07:36:55 -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.2-alpha-dev

2014-12-31 13:24:12 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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