added current timestamp to stat and on_update
Merge branch 'peer-timestamp'