Nick Mathewson ee75c02691 Merge remote-tracking branch 'andrea/bug18116'

2016-02-10 15:42:11 -05:00

..

common

Merge remote-tracking branch 'sebastian/bug18242'

2016-02-10 15:38:52 -05:00

config

Merge branch 'maint-0.2.6' into maint-0.2.7

2016-02-05 08:13:35 -05:00

ext

Repair "make distcheck".

2015-12-20 14:57:27 -05:00

or

Properly detach circuits from cmuxes when calling circuit_free_all() on shutdown again

2016-02-10 05:35:03 +00:00

test

Merge remote-tracking branch 'sebastian/bug18242'

2016-02-10 15:38:52 -05:00

tools

Add the SHA-3 hash functions to common/crypto.h.

2015-12-19 22:44:05 +00:00

trunnel

Mention trunnel in CodingStandards; describe how in trunnel/README

2015-10-14 10:40:27 -04:00

win32

Merge remote-tracking branch 'public/bug18184'

2016-02-10 15:36:48 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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