commit 83e069fd52349009ba2518355d68d6a2c0ac4652 Merge: 32c5806 d229025 Author: Roger Dingledine <arma@torproject.org> Date: Tue Sep 9 07:17:28 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 .gitignore | 2 ++ changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 5 files changed, 14 insertions(+), 8 deletions(-)