Explorar o código

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

This is an "ours" commit ; I'm merging a separate version of the
block-renegotiate patch into 0.2.4.
Nick Mathewson %!s(int64=13) %!d(string=hai) anos
pai
achega
2c2c64287a

Os datos das diferenzas Diff non están dispoñibles.