commit 95ad59fa79cba73a6916b5deccee12b541d5f756 Merge: db9ce36 ce44346 Author: Roger Dingledine <arma@torproject.org> Date: Sat Jun 23 15:46:29 2012 -0400 Merge branch 'maint-0.2.3' ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)