tree 8ef0c5a2584a5b3dbed9f587a808582548a2f3e5
parent 041240485d62fdf1d48de1441e30391bacc7a3c0
author Adam Langley <agl@chromium.org> 1403290800 -0700
committer Adam Langley <agl@chromium.org> 1403295460 -0700

Sync with upstream's fix for PR#3321.

(Imported from upstream's f710c3f198c9980a1056bac9b4b9617554254671)