commit b310929ee36f0a88389dca53124506115c850c3b Merge: 812a658 231564e Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 16 10:57:37 2016 -0500 Merge remote-tracking branch 'jryans/no-changes-unreleased' doc/HACKING/CodingStandards.md | 4 ++++ 1 file changed, 4 insertions(+)