[tor-commits] [tor/master] Merge branch 'bug3199_redux_3'

[nickm at torproject.org]

commit c113d19b53085f0218f892829839817add071576
Merge: 7a940fa 661e5bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 17 08:27:42 2015 -0500

    Merge branch 'bug3199_redux_3'

 src/or/include.am |    2 +
 src/or/main.c     |  892 ++++++++++++++++++++++++++++++++++-------------------
 src/or/periodic.c |  110 +++++++
 src/or/periodic.h |   36 +++
 4 files changed, 721 insertions(+), 319 deletions(-)