[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit e512e6ca59ff86852e29ffe6fbb9d2bdb8688e82
Merge: 803fa75 8d25ab6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 12:43:13 2016 -0400

    Merge branch 'maint-0.2.8' into release-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(-)