From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 20 Feb 2010 23:35:19 +0000 (-0500)
Subject: Merge remote branch 'public/cbt-status'
X-Git-Tag: tor-0.2.2.9-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eb03bc6ddb9ea13eb7902c47a8c782f084bddc1;p=thirdparty%2Ftor.git

Merge remote branch 'public/cbt-status'

Conflicts:
	ChangeLog
---

0eb03bc6ddb9ea13eb7902c47a8c782f084bddc1
diff --cc ChangeLog
index 8b019ed084,641aa74e5c..ce714406b5
--- a/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