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

[nickm at torproject.org]

commit 297635f806ec4244c4e6e6f093f87d647061d42a
Merge: 8feb301 d3a975e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 24 10:03:19 2016 -0400

    Merge branch 'maint-0.2.8'

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