commit 6294eb284617b6604067fbf498f8d38d20268132 Merge: 99c0e1b d00d3f1 Author: Nick Mathewson nickm@torproject.org Date: Thu May 12 10:03:26 2016 -0400

Merge branch 'maint-0.2.8'

changes/doc17621 | 3 +++ doc/tor.1.txt | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 60 insertions(+), 3 deletions(-)