Nick Mathewson e6965f78b8 Merge branch 'maint-0.2.5' into maint-0.2.6

2017-02-07 08:54:54 -05:00

..

common

Merge branch 'maint-0.2.5' into maint-0.2.6

2017-02-07 08:54:54 -05:00

config

Merge branch 'maint-0.2.5' into maint-0.2.6

2017-01-11 09:12:21 -05:00

ext

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

2015-03-23 09:25:15 -04:00

or

Fix out-of-bounds read in INTRODUCE2 client auth

2017-02-07 08:31:37 -05:00

test

Repair breakage in early-error case of microdesc parsing

2015-06-22 13:51:56 -04: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 maint-0.2.6 to 0.2.6.10-dev

2015-07-12 16:37:20 -04:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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