Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Increase timeouts of some unit tests.
  Fix memory leak in modbus analyzer.
  add channel_id tls extension number.
This commit is contained in:
Robin Sommer 2014-02-12 20:17:39 -08:00
commit a57f0ef9a0
10 changed files with 34 additions and 12 deletions

View file

@ -86,6 +86,7 @@ export {
[13172] = "next_protocol_negotiation",
[13175] = "origin_bound_certificates",
[13180] = "encrypted_client_certificates",
[30031] = "channel_id",
[65281] = "renegotiation_info"
} &default=function(i: count):string { return fmt("unknown-%d", i); };