commit dc014c97472e3adf2306938841c13de0040a2ff0 Merge: a2f57b9 c88a4c5 Author: Roger Dingledine arma@torproject.org Date: Sat Sep 22 09:31:09 2012 -0400

Merge branch 'maint-0.2.3'

changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)