Merge remote branch 'public/cbt-status'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 8b019ed084ec386d5c78fce7f6244550ade7bc6e,641aa74e5c08153b9aa7b776831ab4a10ef884ee..ce714406b5b18e3435f28fabd1910eede94f5d38
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -20,9 -20,9 +20,11 @@@ Changes in version 0.2.2.9-alpha - 2010
        implemented in the past.
      - Avoid a bogus overlapped memcpy in tor_addr_copy().  Found by
        "memcpyfail".
- 
 +    - Make the DNSPort option work with libevent 2.x. Don't alter the
 +      behaviour for libevent 1.x. Fixes bug 1143. Found by SwissTorExit.
+     - Emit an GUARD DROPPED event for a case we missed.
+     - Make more fields in the controller protocol case-insensitive as
+       documented in control-spec.txt.
  
    o Code simplifications and refactoring:
      - Generate our manpage and HTML documentation using Asciidoc.  This