commit f45e1626c5c6573691a06e3337fd04b5abbcb9be Merge: 32ef2f3 3681931 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 18 09:27:08 2017 -0500 Merge remote-tracking branch 'origin/master' control-spec.txt | 4 ++-- dir-spec.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)