commit 6a8861574bba27cbe924c147ee85b9fd72fff563 Merge: 5977da6 4aff97c Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 12 11:09:10 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6819 | 3 +++ src/config/torrc.sample.in | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)