commit dd9cebf1099996d3361110fddfc2cf47beb94c5d Merge: 49e8f47 f038e9c Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 21 08:54:49 2016 -0400
Merge branch 'maint-0.2.8'
changes/bug19454 | 3 +++ src/or/main.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-)