commit 3220bd816b1a20eeb8bcaf562dc5382439bb00f7 Merge: 1275d92 f780d19 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 28 16:14:21 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug17744_redux | 5 +++++ changes/bug18673 | 4 ++++ configure.ac | 2 -- doc/tor.1.txt | 2 +- src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 7 files changed, 28 insertions(+), 7 deletions(-)