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

[nickm@xxxxxxxxxxxxxx]

commit fd9a1045d8262d9d788198693788cead7a6e2dfe
Merge: df84536 aae034d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 17 10:17:32 2016 -0400

    Merge branch 'module_docs_1'

 src/common/crypto_curve25519.c | 52 +++++++++++++++++++++++--
 src/common/crypto_curve25519.h | 12 +++++-
 src/common/crypto_ed25519.c    | 29 +++++++++++++-
 src/common/crypto_format.c     |  7 ++++
 src/common/workqueue.c         | 14 +++++++
 src/or/buffers.c               | 20 ++++++++--
 src/or/circuitstats.c          | 13 ++++++-
 src/or/command.c               | 20 ++++++++++
 src/or/connection_edge.c       | 45 ++++++++++++++++++++++
 src/or/control.c               | 26 ++++++++++++-
 src/or/cpuworker.c             |  6 ++-
 src/or/dircollate.c            | 34 +++++++++++++++--
 src/or/dirserv.c               | 18 +++++++++
 src/or/dns.c                   | 53 ++++++++++++++++++++++++--
 src/or/dns_structs.h           | 12 ++++++
 src/or/fp_pair.c               |  8 ++++
 src/or/geoip.c                 | 18 +++++++++
 src/or/hibernate.c             | 24 +++++++++---
 src/or/keypin.c                | 12 ++++++
 src/or/ntmain.c                | 10 ++++-
 src/or/onion.c                 | 52 +++++++++++++++++++++++++
 src/or/onion_fast.c            | 18 +++++++++
 src/or/onion_ntor.c            | 11 ++++++
 src/or/onion_tap.c             | 12 ++++++
 src/or/periodic.c              |  4 ++
 src/or/protover.c              | 24 ++++++++++++
 src/or/protover.h              |  7 ++++
 src/or/reasons.c               |  6 +++
 src/or/rephist.c               | 70 +++++++++++++++++++++++++++++++++-
 src/or/replaycache.c           | 12 ++++++
 src/or/routerlist.c            | 86 +++++++++++++++++++++++++++++++++++++++++-
 src/or/routerparse.c           | 63 +++++++++++++++++++++++++++----
 src/or/routerset.c             | 14 +++++++
 src/or/statefile.c             | 17 +++++++++
 src/or/status.c                |  8 +++-
 src/or/tor_main.c              |  6 ++-
 36 files changed, 801 insertions(+), 42 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits