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

[nickm at torproject.org]

commit a839ed5cc1e12aa096191909e67c715f0863a20a
Merge: b673f7e f038e9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 21 08:54:39 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19454 |  3 +++
 src/or/main.c    | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)