Nick Mathewson 3e9409ef58 Merge remote-tracking branch 'origin/maint-0.2.6'

2015-02-24 11:36:34 -05:00

..

common

Merge branch 'bug14950_logs_squashed'

2015-02-23 13:04:03 -05: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

Log less/better about systemd at startup

2015-02-24 11:11:24 -05:00

test

Update test_status.c to accommodate changes in heartbeat messages

2015-02-24 10:05:34 -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 master to 0.2.7

2015-02-24 10:31:05 -05:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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