changes to sr_router.*
Merge branch 'master' of https://github.com/manguva/networks13