modified:   log.cpp
Merge branch 'master' of github.com:yoggy/bruco_proxy