commit a053451ddf4899d35182cd18c50a13eceb27030a Merge: 494dea7 7155ee8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 17 09:25:23 2015 -0400 Merge remote-tracking branch 'isis/fix/circuitlist-docstring-typo' src/or/circuitlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)