commit 2c97cf3add00bdaadecd4e581dff2d7b30437c33 Merge: 3430b487d 619178bb3 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 16 12:31:47 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1329'

changes/ticket31336 | 3 +++ scripts/maint/add_c_file.py | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)