commit 5d06bbc66feefef2ea280fa0e7968711a912264b Merge: 639766dbc f8c14a987 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 15 16:07:37 2017 -0400 Merge branch 'annotate_ifdefs' scripts/maint/annotate_ifdef_directives | 74 +++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)