commit 44e6663b8a51187e80a3f94d1185950cf62b4264 Merge: 206d28ff1 ac5753d3c Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 29 13:36:35 2019 -0400

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

changes/ticket30261 | 4 ++++ doc/HACKING/CodingStandards.md | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-)