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

[nickm at torproject.org]

commit 90c24c0ced62a36c3100e49ad404b3519ba1cd77
Merge: 055a7a1 ba87f5b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 28 20:09:22 2016 -0400

    Merge branch 'maint-0.2.8'

 src/or/circuitlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)