[tor-commits] [tor/master] Merge remote-tracking branch 'asn/nickm-bug12864_025' into maint-0.2.5

[nickm at torproject.org]

commit 967b4e7c54b53391e1a0b67e0a5bf70bc2e6a896
Merge: 0cb028b 112c984
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 15 17:40:13 2014 -0400

    Merge remote-tracking branch 'asn/nickm-bug12864_025' into 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(-)