commit 1f35fd0017240a82ae48475a989819aa81a297dc Merge: be231b0 967b4e7 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 15 17:41:13 2014 -0400

Merge remote-tracking branch 'origin/maint-0.2.5'

changes/bug12864 | 7 +++++++ doc/tor.1.txt | 9 ++++++++- src/or/config.c | 14 +++++++++++++- src/or/config.h | 2 +- src/or/control.c | 1 + src/or/ext_orport.c | 1 + src/or/or.h | 2 ++ 7 files changed, 33 insertions(+), 3 deletions(-)