[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket25991_034_01'

[nickm at torproject.org]

commit 94c6eb7d7f023e50071632e618f003409e5e6489
Merge: 48d8fe533 224c93b97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 3 13:41:34 2018 -0400

    Merge remote-tracking branch 'dgoulet/ticket25991_034_01'

 doc/HACKING/Module.md | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/include.am        |   5 +++
 2 files changed, 116 insertions(+)