aboutsummaryrefslogtreecommitdiff
path: root/src/common/tortls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-04 11:47:36 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-04 11:47:36 -0400
commit41e8bee188571ca61c2f5628ea99dff34343d673 (patch)
treee6055eb8b470fad84f384197d9876392d0570a09 /src/common/tortls.c
parent329e1c65d3c73ad7b3b4cdaa870dd04fd7fb01b7 (diff)
parent491dc3a601d7c2610503f73192bd1a40bcb37ab2 (diff)
downloadtor-41e8bee188571ca61c2f5628ea99dff34343d673.tar
tor-41e8bee188571ca61c2f5628ea99dff34343d673.tar.gz
Merge origin/maint-0.2.2 for 6007_strict
This code shouldn't have any effect in 0.2.3, since we already accept (and handle) data received while we are expecting a renegotiation. (That's because the 0.2.3.x handshake _does_ have data there instead of the renegotiation.) I'm leaving it in anyway, since if it breaks anything, we'll want it broken in master too so we can find out about it. I added an XXX023 comment so that we can come back later and fix that.
Diffstat (limited to 'src/common/tortls.c')
0 files changed, 0 insertions, 0 deletions