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

[nickm at torproject.org]

commit 824b1609313d8e055c2a733da1a0c3b5d6df24af
Merge: fa038eb d3a975e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 10:03:29 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19728 | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)