Nick Mathewson 9ea3d0877a Merge branch 'maint-0.2.5' into maint-0.2.6

2017-06-05 12:00:27 -04: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-05-08 08:07:04 -04:00

ext

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

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

or

Merge branch 'maint-0.2.5' into maint-0.2.6

2017-06-05 12:00:27 -04: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 to 0.2.6.11

2017-02-28 10:26:24 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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