[tor-commits] [tor/master] Merge branch 'asn-karsten-task-13192-5-squashed'

[nickm at torproject.org]

commit 64787e99faa794463e2e9a162340aa457018d321
Merge: eee248b 13a6fb9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 19 10:35:47 2014 -0500

    Merge branch 'asn-karsten-task-13192-5-squashed'

 changes/feature13192 |   13 +++
 doc/tor.1.txt        |    7 ++
 src/common/crypto.c  |    2 +-
 src/common/crypto.h  |    2 +-
 src/common/util.c    |   45 +++++++++++
 src/common/util.h    |    4 +
 src/or/command.c     |    9 +++
 src/or/config.c      |   13 +++
 src/or/main.c        |    5 ++
 src/or/or.h          |    8 ++
 src/or/rendcommon.c  |    7 ++
 src/or/rendmid.c     |    7 ++
 src/or/rephist.c     |  216 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/rephist.h     |    7 ++
 src/or/router.c      |    5 ++
 src/test/test_util.c |   53 +++++++++++++
 16 files changed, 401 insertions(+), 2 deletions(-)