[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 8cae4abbacbda313081b1a567cb87d74bb9cea82
Merge: f54ffa4 8d25ab6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:43:17 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/asciidoc-UTC   | 4 ++++
 changes/bug19556       | 7 +++++++
 changes/bug19557       | 4 ++++
 doc/asciidoc-helper.sh | 2 +-
 src/or/main.c          | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)