Merge branch 'security-master' into HEAD 99/10999/1
authorSimon Wilkinson <sxw@your-file-system.com>
Wed, 9 Apr 2014 13:10:09 +0000 (14:10 +0100)
committerSimon Wilkinson <sxw@your-file-system.com>
Wed, 9 Apr 2014 14:08:49 +0000 (15:08 +0100)
Merge fix for OpenAFS-SA-2014-001 into master, along with the fix
for the RX denial of service issue.

Change-Id: I499e7202c9278d21f2d8628d497755e6c593abb2

1  2 
src/rx/rx.c

diff --cc src/rx/rx.c
Simple merge