Nick Mathewson 2499ea359a Merge branch 'maint-0.2.9'

2016-12-07 11:14:56 -05:00

..

common

Merge branch 'maint-0.2.9'

2016-12-07 10:52:28 -05:00

config

In torrc.sample.in, note that bandwidth must be >=75 KB.

2016-11-08 19:23:49 -05:00

ext

Regenerate trunnel code with trunnel 1.5

2016-10-26 11:06:45 -04:00

or

Merge branch 'maint-0.2.9'

2016-12-07 11:14:56 -05:00

test

Merge branch 'maint-0.2.9'

2016-12-07 11:09:27 -05:00

tools

Merge branch 'maint-0.2.8' into maint-0.2.9

2016-11-03 15:41:04 -04:00

trunnel

Merge branch 'ticket17238_029_02-resquash'

2016-11-04 13:26:37 -04:00

win32

Bump to 0.2.9.6-rc-dev

2016-12-02 11:20:23 -05:00

include.am

…