Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source

This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.

...

This commit is contained in:

Nick Mathewson 2012-10-19 14:32:22 -04:00

parent 0dac0d8ad6 1cc06bd35e

commit 2c2c64287a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available