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

[nickm at torproject.org]

commit 8340becd39920ef6363ab6c7d494cc7abf70c202
Merge: b2083cb 054d939
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 2 14:02:15 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18920 | 5 +++++
 src/or/control.c | 5 +++++
 2 files changed, 10 insertions(+)