[tor-commits] [tor/master] Merge remote-tracking branch 'teor/warn-when-time-goes-backwards'

[nickm at torproject.org]

commit 67182226f10fde686f7d541cad3c608f74415205
Merge: 488e9a0 763cb39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 2 13:56:28 2015 +0200

    Merge remote-tracking branch 'teor/warn-when-time-goes-backwards'

 changes/warn-when-time-goes-backwards |    5 +++++
 src/or/statefile.c                    |   13 +++++++++++++
 2 files changed, 18 insertions(+)