aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
Diffstat (limited to 'changes')
-rw-r--r--changes/automake_required6
-rw-r--r--changes/autoreconf5
-rw-r--r--changes/bufferevent-support12
-rw-r--r--changes/bug1074-part26
-rw-r--r--changes/bug19825
-rw-r--r--changes/bug20044
-rw-r--r--changes/bug20604
-rw-r--r--changes/bug2081_followup9
-rw-r--r--changes/bug2097-more6
-rw-r--r--changes/bug2146.14
-rw-r--r--changes/bug21814
-rw-r--r--changes/bug219011
-rw-r--r--changes/bug22036
-rw-r--r--changes/bug22105
-rw-r--r--changes/bug22353
-rw-r--r--changes/bug227915
-rw-r--r--changes/bug23055
-rw-r--r--changes/bug23134
-rw-r--r--changes/bug23144
-rw-r--r--changes/bug23179
-rw-r--r--changes/bug23244
-rw-r--r--changes/bug2324_uncompress5
-rw-r--r--changes/bug23266
-rw-r--r--changes/bug23289
-rw-r--r--changes/bug23307
-rw-r--r--changes/bug23317
-rw-r--r--changes/bug23324
-rw-r--r--changes/bug23373
-rw-r--r--changes/bug23466
-rw-r--r--changes/bug23526
-rw-r--r--changes/bug23585
-rw-r--r--changes/bug23636
-rw-r--r--changes/bug23644
-rw-r--r--changes/bug23788
-rw-r--r--changes/bug23846
-rw-r--r--changes/bug24086
-rw-r--r--changes/bug24094
-rw-r--r--changes/bug24325
-rw-r--r--changes/bug24335
-rw-r--r--changes/bug24444
-rw-r--r--changes/bug24505
-rw-r--r--changes/bug24705
-rw-r--r--changes/bug507.event4
-rw-r--r--changes/bytecount5
-rw-r--r--changes/cpudetect3
-rw-r--r--changes/dhparam3
-rw-r--r--changes/dirreq-stats-default4
-rw-r--r--changes/enhancement16684
-rw-r--r--changes/enhancement18194
-rw-r--r--changes/enhancement18834
-rw-r--r--changes/eventdns_routerinfo_key4
-rw-r--r--changes/feature19554
-rw-r--r--changes/feature23454
-rw-r--r--changes/fix2195-fix6
-rw-r--r--changes/gabelmoo-newip3
-rw-r--r--changes/geoip-dec20103
-rw-r--r--changes/geoip-feb20113
-rw-r--r--changes/geoip-jan20113
-rw-r--r--changes/getinfo_process3
-rw-r--r--changes/heartbeat7
-rw-r--r--changes/install-fix3
-rw-r--r--changes/microdesc_dl4
-rw-r--r--changes/mingw-openssl098m3
-rw-r--r--changes/nodelist10
-rw-r--r--changes/policy_summarize-assert6
-rw-r--r--changes/remove-website5
-rw-r--r--changes/routerparse_maxima4
-rw-r--r--changes/security_bug5
-rw-r--r--changes/task21965
-rw-r--r--changes/tolen_asserts8
-rw-r--r--changes/tor-fw-helper14
71 files changed, 108 insertions, 277 deletions
diff --git a/changes/automake_required b/changes/automake_required
new file mode 100644
index 000000000..bb5035518
--- /dev/null
+++ b/changes/automake_required
@@ -0,0 +1,6 @@
+ o Build changes
+ - Our build system requires automake 1.6 or later to create the
+ Makefile.in files. Previously, you could have used 1.4.
+ This only affects developers and people building Tor from git;
+ people who build Tor from the source distribution without changing
+ the Makefile.am files should be fine.
diff --git a/changes/autoreconf b/changes/autoreconf
new file mode 100644
index 000000000..c08cc7a37
--- /dev/null
+++ b/changes/autoreconf
@@ -0,0 +1,5 @@
+ o Minor build changes:
+ - Use autoreconf to launch autoconf, automake, etc from autogen.sh.
+ This is more robust against some of the failure modes associated
+ with running the autotools chain on its own.
+
diff --git a/changes/bufferevent-support b/changes/bufferevent-support
new file mode 100644
index 000000000..e39c36f13
--- /dev/null
+++ b/changes/bufferevent-support
@@ -0,0 +1,12 @@
+ o Major features
+ - Tor can now optionally build with the "bufferevents" buffered IO
+ backend provided by Libevent, when building with Libevent 2.0.7-rc
+ or later. To use this feature, make sure you have the latest possible
+ version of Libevent, and run autoconf with the --enable-bufferevents
+ flag. Using this feature will make our networking code more flexible,
+ lets us stack layers on each other, and let us use more efficient
+ zero-copy transports where available.
+ - As an experimental feature, when using the "bufferevents" buffered
+ IO backend, Tor can try to use Windows's IOCP networking API. This
+ is off by default. To turn it on, add "DisableIOCP 0" to your torrc.
+
diff --git a/changes/bug1074-part2 b/changes/bug1074-part2
deleted file mode 100644
index 6644f496d..000000000
--- a/changes/bug1074-part2
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes:
- - Stop sending a CLOCK_SKEW controller status event whenever
- we fetch directory information from a relay that has a wrong clock.
- Instead, only inform the controller when it's a trusted authority
- that claims our clock is wrong. Bugfix on tor-0.1.2.6-alpha;
- fixes the other half of bug 1074.
diff --git a/changes/bug1982 b/changes/bug1982
new file mode 100644
index 000000000..30ce2df7c
--- /dev/null
+++ b/changes/bug1982
@@ -0,0 +1,5 @@
+ o Major features:
+ - Allow EntryNodes to include country codes like {de} or IP addresses
+ or network masks. Previously we had disallowed these options
+ because we didn't have an efficient way to keep the list up to
+ date. Resolves bug 1982.
diff --git a/changes/bug2004 b/changes/bug2004
deleted file mode 100644
index 4fd6c91a0..000000000
--- a/changes/bug2004
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features
- - Log less aggressively about circuit timeout changes, and improve some
- other circuit timeout messages. Resolves bug 2004.
-
diff --git a/changes/bug2060 b/changes/bug2060
deleted file mode 100644
index eb95aedb2..000000000
--- a/changes/bug2060
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features
- - Make sure to disable DirPort if running as a bridge. DirPorts aren't
- used on bridges, and it makes bridge scanning way too easy.
-
diff --git a/changes/bug2081_followup b/changes/bug2081_followup
deleted file mode 100644
index a53227c38..000000000
--- a/changes/bug2081_followup
+++ /dev/null
@@ -1,9 +0,0 @@
- o Minor features (authorities)
- - Directory authorities now reject relays running any versions of
- Tor between 0.2.1.3-alpha and 0.2.1.18 inclusive; they have
- known bugs that keep RELAY_EARLY cells from working on rendezvous
- circuits. Followup to fix for bug 2081.
- - Directory authorities now reject relays running any version of Tor
- older than 0.2.0.26-rc. That is the earliest version that fetches
- current directory information correctly. Fix for bug 2156.
-
diff --git a/changes/bug2097-more b/changes/bug2097-more
deleted file mode 100644
index 52351cc01..000000000
--- a/changes/bug2097-more
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes:
- - Fix a logic error in directory_fetches_from_authorities that
- would cause all _non_-exits refusing single-hop-like circuits to
- fetch from authorities, when we wanted to have _exits_ fetch
- from authorities. Fix by boboper; fixes more of 2097; bugfix on
- 0.2.2.16-alpha.
diff --git a/changes/bug2146.1 b/changes/bug2146.1
deleted file mode 100644
index 5b91c59a6..000000000
--- a/changes/bug2146.1
+++ /dev/null
@@ -1,4 +0,0 @@
- - Major bugfixes:
- o Fix a bug that could break accounting on 64-bit systems with large
- time_t values, making them hibernate for impossibly long intervals.
- Bugfix on 0.0.9pre6; fix for bug 2146; fix by boboper.
diff --git a/changes/bug2181 b/changes/bug2181
deleted file mode 100644
index 0a095488e..000000000
--- a/changes/bug2181
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features
- - Log a little more clearly about the times at which we're no longer
- accepting new connections. Resolves bug 2181.
-
diff --git a/changes/bug2190 b/changes/bug2190
deleted file mode 100644
index 0591acb6f..000000000
--- a/changes/bug2190
+++ /dev/null
@@ -1,11 +0,0 @@
- o Minor bugfixes
- - Prevent calls from Libevent from inside Libevent log handlers.
- This had potential to cause a nasty set of crashes, especially if
- running Libevent with debug logging enabled, and running Tor
- with a controller watching for low-severity log messages.
- Bugfix on 0.1.0.2-rc. Fixes bug 2190.
- - Make Libevent log messages get delievered to controllers later,
- and not from inside the Libevent log handler. This prevents
- unsafe reentrant Libevent calls while still letting the log
- messages get through.
-
diff --git a/changes/bug2203 b/changes/bug2203
deleted file mode 100644
index 9cfbedf14..000000000
--- a/changes/bug2203
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes:
- - Clients should not weight BadExit nodes as Exits in their node
- selection. Similarly, directory authorities should not count
- BadExit bandwidth as Exit bandwidth when computing bandwidth-weights.
- Bugfix on 0.2.2.10-alpha; fixes bug 2203.
-
diff --git a/changes/bug2210 b/changes/bug2210
deleted file mode 100644
index fe1c049fc..000000000
--- a/changes/bug2210
+++ /dev/null
@@ -1,5 +0,0 @@
- o ?? bugfixes:
- - Fix a bug that would cause newer streams on a given circuit to
- get preference when reading bytes from the network. Fixes bug
- 2210. Fix by Mashael AlSabah. This bug was introduced before
- the first Tor release, in svn revision r152.
diff --git a/changes/bug2235 b/changes/bug2235
deleted file mode 100644
index 0c3bafa44..000000000
--- a/changes/bug2235
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes
- - Avoid crashes when AccountingMax is set on clients. Fixes bug 2235;
- Bugfix on 0.2.2.18-alpha. Diagnosed by boboper.
diff --git a/changes/bug2279 b/changes/bug2279
deleted file mode 100644
index d31300978..000000000
--- a/changes/bug2279
+++ /dev/null
@@ -1,15 +0,0 @@
- o Minor bugfixes
- - Avoid a double mark-for-free warning when failing to attach a
- transparent proxy connection. Fixes bug 2279. Bugfix on
- Tor 0.1.2.1 alpha.
-
- o Minor features
- - Detect attempts at the client side to open connections to private
- IP addresses (like 127.0.0.1, 10.0.0.1, and so on) with a randomly
- chosen exit node. Attempts to do so are always ill-defined, generally
- prevented by exit policies, and usually in error. This will also
- help to detect loops in transparent proxy configurations. You can
- disable this feature by setting "ClientRejectInternalAddresses 0"
- in your torrc.
-
-
diff --git a/changes/bug2305 b/changes/bug2305
deleted file mode 100644
index c979d5fd3..000000000
--- a/changes/bug2305
+++ /dev/null
@@ -1,5 +0,0 @@
- o Build changes
- - Tor does not build packages correctly with Automake 1.6 and earlier;
- added a check to Makefile.am to make sure that we're building with
- Automake 1.7 or later.
-
diff --git a/changes/bug2313 b/changes/bug2313
deleted file mode 100644
index 0ffbe4ab0..000000000
--- a/changes/bug2313
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes
- - Fix compilation on mingw when a pthreads compatibility library
- has been installed. (We don't want to use it, so we shouldn't
- be including pthread.h.) Fixes bug 2313; bugfix on 0.1.0.1-rc.
diff --git a/changes/bug2314 b/changes/bug2314
deleted file mode 100644
index 41a232812..000000000
--- a/changes/bug2314
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes:
- - Fix a bunch of compile warnings revealed by mingw with gcc 4.5. Fixes
- bug 2314.
-
diff --git a/changes/bug2317 b/changes/bug2317
deleted file mode 100644
index 0b9366c36..000000000
--- a/changes/bug2317
+++ /dev/null
@@ -1,9 +0,0 @@
- o Major features:
- - Introduce minimum/maximum values that a client is going to believe
- in a consensus. This helps to avoid crashes or worse when a param
- has a weird value.
-
- o Major bugfixes:
- - Prevent crash/heap corruption when cbtnumnodes consensus parameter is
- set to 0 or large values. Fixes bug 2317.
-
diff --git a/changes/bug2324 b/changes/bug2324
deleted file mode 100644
index eefc8370e..000000000
--- a/changes/bug2324
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes
- - Add a check for SIZE_T_MAX to tor_realloc to try to avoid
- underflow errors there too. Fixes bug 2324.
-
diff --git a/changes/bug2324_uncompress b/changes/bug2324_uncompress
deleted file mode 100644
index 223a3ce35..000000000
--- a/changes/bug2324_uncompress
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes (security):
- - Prevent a DoS attack by disallowing any zlib-compressed data
- whose compression factor is implausibly high. Fixes the
- second part of bug2324; found by doors.
-
diff --git a/changes/bug2326 b/changes/bug2326
deleted file mode 100644
index 239a383fa..000000000
--- a/changes/bug2326
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes
- - Fix a bug where we would assert if we ever had a
- cached-descriptors.new file (or another file read directly into
- memory) of exactly SIZE_T_CEILING bytes. Found by doors; fixes
- bug 2326; bugfix on 0.2.1.25.
-
diff --git a/changes/bug2328 b/changes/bug2328
deleted file mode 100644
index fee80a158..000000000
--- a/changes/bug2328
+++ /dev/null
@@ -1,9 +0,0 @@
- o Minor bugfixes
- - Fix a bug where we would declare that we had run out of virtual
- addresses when the address space was only half-exhausted. Bugfix
- on 0.1.2.1-alpha.
- - Correctly handle the case where AutomapHostsOnResolve is set but no
- virtual addresses are available. Fixes bug2328, bugfix on
- 0.1.2.1-alpha. Bug found by doorss.
- - Correctly handle wrapping around to when we run out of virtual address
- space. Found by cypherpunks, bugfix on 0.2.0.5-alpha.
diff --git a/changes/bug2330 b/changes/bug2330
deleted file mode 100644
index fc0c4d8c3..000000000
--- a/changes/bug2330
+++ /dev/null
@@ -1,7 +0,0 @@
- o Minor bugfixes
- - Handle SOCKS messages longer than 128 bytes long correctly, rather
- than waiting forever for them to finish. Fixes bug 2330. Bugfix on
- 0.2.0.16-alpha. Found by doorss.
-
-
-
diff --git a/changes/bug2331 b/changes/bug2331
deleted file mode 100644
index 9940b591c..000000000
--- a/changes/bug2331
+++ /dev/null
@@ -1,7 +0,0 @@
- o Minor bugfixes:
- - Add assertions to check for overflow in arguments to
- base32_encode and base32_decode; fix a signed-unsigned
- comparison there too. These bugs are not actually reachable in
- Tor, but it's good to prevent future errors too. Found by
- doorss.
-
diff --git a/changes/bug2332 b/changes/bug2332
deleted file mode 100644
index 5f73ddd7a..000000000
--- a/changes/bug2332
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes
- - Fix a bug with handling misformed replies to reverse DNS lookup
- requests in DNSPort. Bugfix on Tor 0.2.0.1-alpha. Related to a bug
- reported by doorss.
diff --git a/changes/bug2337 b/changes/bug2337
deleted file mode 100644
index a4f052dc3..000000000
--- a/changes/bug2337
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes
- - Detect broken platforms with a signed size_t, and refuse to
- build there. Found and analyzed by doorss and rransom.
diff --git a/changes/bug2346 b/changes/bug2346
deleted file mode 100644
index 0f78b8461..000000000
--- a/changes/bug2346
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor features
- - If writing the state file to disk fails, wait up to an hour
- before retrying again. (Our old code would retry the write
- immediately.) Fixes bug 2346. Bugfix on Tor 0.1.1.3-alpha.
-
-
diff --git a/changes/bug2352 b/changes/bug2352
deleted file mode 100644
index 744dbdb20..000000000
--- a/changes/bug2352
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes
- - Fix some potential asserts and partsing issues with grossly
- malformed router caches. Fixes bug 2352. Found by doorss.
- Bugfix on Tor 0.2.1.27.
-
-
diff --git a/changes/bug2358 b/changes/bug2358
deleted file mode 100644
index 5e44bb9f8..000000000
--- a/changes/bug2358
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor features
- - Enable Address Space Layout Randomization (ASLR) and Data Execution
- Prevention (DEP) by default on Windows to make it harder for
- attackers to exploit vulnerabilities. Patch from John Brooks.
-
diff --git a/changes/bug2363 b/changes/bug2363
deleted file mode 100644
index 179925f65..000000000
--- a/changes/bug2363
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes
- - Correctly detect failures to create DNS requests when using Libevent
- versions before v2. (Before Libevent 2, we used our own evdns
- implementation. Its return values for Libevent's evdns_resolve_*()
- functions are not consistent with those from Libevent.) Found by
- Lodger; fixes bug 2363; bugfix on 0.2.2.6-alpha.
diff --git a/changes/bug2364 b/changes/bug2364
deleted file mode 100644
index 37de6ef52..000000000
--- a/changes/bug2364
+++ /dev/null
@@ -1,4 +0,0 @@
- o Documentation
- - Document the default socks host and port (127.0.0.1:9050) for
- tor-resolve.
-
diff --git a/changes/bug2378 b/changes/bug2378
deleted file mode 100644
index 227968869..000000000
--- a/changes/bug2378
+++ /dev/null
@@ -1,8 +0,0 @@
- o Minor bugfixes
- - Correctly detect failure to allocate an OpenSSL BIO. Fixes bug 2378;
- found by "cypherpunks". This bug was introduced before the
- first Tor release, in svn commit r110.
-
- o Minor code simplifications and refactorings
- - Always treat failure to allocate an RSA key as an unrecoverable
- allocation error.
diff --git a/changes/bug2384 b/changes/bug2384
deleted file mode 100644
index ded5eee99..000000000
--- a/changes/bug2384
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes
- - Zero out a few more keys in memory before freeing them. Fixes bug
- 2384 and part of bug 2385. These key instances found by
- "cypherpunks". Bugfix on 0.0.2pre9.
-
-
diff --git a/changes/bug2408 b/changes/bug2408
deleted file mode 100644
index 1d2dbf1ad..000000000
--- a/changes/bug2408
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes
- - Ignore and warn about "PublishServerDescriptor hidserv" torrc
- options. The 'hidserv' argument never controlled publication
- of hidden service descriptors. Bugfix on 0.2.0.1-alpha.
-
-
diff --git a/changes/bug2409 b/changes/bug2409
deleted file mode 100644
index 5523458b6..000000000
--- a/changes/bug2409
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes
- - Resolve a bug in verifying signatures of directory objects
- with digests longer than SHA1. Bugfix on 0.2.2.20-alpha;
- fixes bug 2409; found by "piebeer".
diff --git a/changes/bug2432 b/changes/bug2432
deleted file mode 100644
index 407c56ba9..000000000
--- a/changes/bug2432
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor features:
- - Provide a log message stating which geoip file we're parsing
- instead of just stating that we're parsing the geoip file.
- Implements ticket 2432.
-
diff --git a/changes/bug2433 b/changes/bug2433
deleted file mode 100644
index 8e47c4f02..000000000
--- a/changes/bug2433
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes:
- - Don't assert when changing from bridge to relay or vice versa with a controller.
- The assert happened because we didn't properly initialize our keys in this case.
- Bugfix on 0.2.2.18, fixes bug 2433. Issue first discovered by bastik.
-
diff --git a/changes/bug2444 b/changes/bug2444
new file mode 100644
index 000000000..405e8dcb4
--- /dev/null
+++ b/changes/bug2444
@@ -0,0 +1,4 @@
+ o Minor features:
+ - If we did find a configuration file, log a message saying where we found
+ it during startup. Implements ticket 2444.
+
diff --git a/changes/bug2450 b/changes/bug2450
deleted file mode 100644
index b3b50ddb0..000000000
--- a/changes/bug2450
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes:
- - Country codes aren't supported in EntryNodes until 0.2.3.x.
- Don't mention them in the manpage. Fixes bug 2450, issue
- spotted by keb and G-Lo.
-
diff --git a/changes/bug2470 b/changes/bug2470
deleted file mode 100644
index 8ff97b7bc..000000000
--- a/changes/bug2470
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes:
- - If relays set RelayBandwidthBurst but not RelayBandwidthRate,
- Tor would ignore their RelayBandwidthBurst setting,
- potentially using more bandwidth than expected. Bugfix on
- 0.2.0.1-alpha. Reported by Paul Wouters. Fixes bug 2470.
diff --git a/changes/bug507.event b/changes/bug507.event
new file mode 100644
index 000000000..68ef4b143
--- /dev/null
+++ b/changes/bug507.event
@@ -0,0 +1,4 @@
+ o Code simplifications
+ - We no longer need link tor-gencert, tor-resolve, or tor-checkkey
+ against libevent; they don't use them, and our code was already
+ refactored not to force them to use them.
diff --git a/changes/bytecount b/changes/bytecount
deleted file mode 100644
index 50c4d6b35..000000000
--- a/changes/bytecount
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes
- - Fix a off-by-one error in calculating some controller command argument
- lengths. Fortunately, this is harmless, the controller code does
- redundant NUL termination too. Found by boboper. Bugfix on
- 0.1.1.1-alpha.
diff --git a/changes/cpudetect b/changes/cpudetect
new file mode 100644
index 000000000..eeaa492f5
--- /dev/null
+++ b/changes/cpudetect
@@ -0,0 +1,3 @@
+ o Minor features
+ - If you set the NumCPUs option to 0, Tor will try to detect how many
+ CPUs you have. This is the new default behavior.
diff --git a/changes/dhparam b/changes/dhparam
deleted file mode 100644
index cb31243ba..000000000
--- a/changes/dhparam
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features
- - Adjust our TLS Diffie-Hellman parameters to match those used by
- Apache's mod_ssl.
diff --git a/changes/dirreq-stats-default b/changes/dirreq-stats-default
new file mode 100644
index 000000000..673be6af1
--- /dev/null
+++ b/changes/dirreq-stats-default
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Turn on directory request statistics by default and include them in
+ extra-info descriptors. Don't break if we have no GeoIP database.
+
diff --git a/changes/enhancement1668 b/changes/enhancement1668
new file mode 100644
index 000000000..0d9f88fa0
--- /dev/null
+++ b/changes/enhancement1668
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Make logging resolution configurable and change default from 1
+ millisecond to 1 second. Implements enhancement 1668.
+
diff --git a/changes/enhancement1819 b/changes/enhancement1819
new file mode 100644
index 000000000..9a3f2af2b
--- /dev/null
+++ b/changes/enhancement1819
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Relays that set "ConnDirectionStatistics 1" write statistics on the
+ birectional use of connections to disk every 24 hours.
+
diff --git a/changes/enhancement1883 b/changes/enhancement1883
new file mode 100644
index 000000000..fe6bc1ab7
--- /dev/null
+++ b/changes/enhancement1883
@@ -0,0 +1,4 @@
+ o Minor features:
+ - Add GeoIP file digest to extra-info descriptor. Implements
+ enhancement 1883.
+
diff --git a/changes/eventdns_routerinfo_key b/changes/eventdns_routerinfo_key
new file mode 100644
index 000000000..46dcb52db
--- /dev/null
+++ b/changes/eventdns_routerinfo_key
@@ -0,0 +1,4 @@
+ o Minor feature removals
+ - Removed old code to work around versions of Tor so old that they
+ used multiple forked processes to handle DNS requests. Such
+ versions of Tor are no longer in use as servers.
diff --git a/changes/feature1955 b/changes/feature1955
new file mode 100644
index 000000000..169b7fd8a
--- /dev/null
+++ b/changes/feature1955
@@ -0,0 +1,4 @@
+ o Minor features (controller)
+ - Add a new SIGNAL event to the controller interface so that
+ controllers can be notified when Tor handles a signal. Resolves
+ issue 1955. Patch by John Brooks.
diff --git a/changes/feature2345 b/changes/feature2345
new file mode 100644
index 000000000..5ab6a0f01
--- /dev/null
+++ b/changes/feature2345
@@ -0,0 +1,4 @@
+ o Minor features (controller)
+ - Add GETINFO options to get total bytes read and written. Patch
+ from pipe, revised by atagar. Resolves ticket 2345.
+
diff --git a/changes/fix2195-fix b/changes/fix2195-fix
deleted file mode 100644
index 9f03c2465..000000000
--- a/changes/fix2195-fix
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes:
- - Do not dereference NULL if a bridge fails to build its
- extra-info descriptor. Previously, we would have dereferenced
- NULL. Found by an anonymous commenter on Trac. Bugfix on
- 0.2.2.19-alpha.
-
diff --git a/changes/gabelmoo-newip b/changes/gabelmoo-newip
deleted file mode 100644
index 8e9a19c65..000000000
--- a/changes/gabelmoo-newip
+++ /dev/null
@@ -1,3 +0,0 @@
- o Directory authority changes:
- - Change IP address and ports for gabelmoo (v3 directory authority).
-
diff --git a/changes/geoip-dec2010 b/changes/geoip-dec2010
deleted file mode 100644
index d6247cee6..000000000
--- a/changes/geoip-dec2010
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the December 1 2010 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-feb2011 b/changes/geoip-feb2011
deleted file mode 100644
index 12eb0ac4b..000000000
--- a/changes/geoip-feb2011
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the February 1 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-jan2011 b/changes/geoip-jan2011
deleted file mode 100644
index b58805ad3..000000000
--- a/changes/geoip-jan2011
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the January 1 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/getinfo_process b/changes/getinfo_process
new file mode 100644
index 000000000..c6eb6c0af
--- /dev/null
+++ b/changes/getinfo_process
@@ -0,0 +1,3 @@
+ o Minor features
+ - Implement some GETINFO controller fields to provide information about
+ the Tor process's pid, euid, username, and resource limits.
diff --git a/changes/heartbeat b/changes/heartbeat
new file mode 100644
index 000000000..008d915c2
--- /dev/null
+++ b/changes/heartbeat
@@ -0,0 +1,7 @@
+ o Minor features
+ - Add a new 'Heartbeat' log message type to periodically log a
+ message describing Tor's status at level Notice. This feature
+ is meant for operators who log at notice, adn want to make sure
+ that their Tor server is still working. Implementation by
+ George Kadianakis.
+
diff --git a/changes/install-fix b/changes/install-fix
new file mode 100644
index 000000000..fb921ebd9
--- /dev/null
+++ b/changes/install-fix
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Correct a broken faq link in the INSTALL file. Fixes bug 2307.
+
diff --git a/changes/microdesc_dl b/changes/microdesc_dl
new file mode 100644
index 000000000..aca634c13
--- /dev/null
+++ b/changes/microdesc_dl
@@ -0,0 +1,4 @@
+ o Major features:
+ - Caches now download and cache all the consensus flavors that
+ they know about. This allows them to assess which microdescriptors
+ they need to fetch.
diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m
deleted file mode 100644
index b4199760b..000000000
--- a/changes/mingw-openssl098m
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features
- - Build correctly on mingw with more recent version of OpenSSL 0.9.8.
- Patch from mingw-san.
diff --git a/changes/nodelist b/changes/nodelist
new file mode 100644
index 000000000..033a6c10f
--- /dev/null
+++ b/changes/nodelist
@@ -0,0 +1,10 @@
+ o Code refactorings
+ - Unified our node-listing and selecting logic. We had at least
+ two major ways to look at the question of "which Tor servers do
+ we know about": our list of router descriptors, and the current
+ consensus. We're adding a third in microdescriptors. Having
+ so many systems without an abstraction layer over them was
+ hurting the codebase. Now, we have a new "node_t" abstraction
+ that presents a consistent interface to a client's view of
+ a Tor node, and holds (nearly) all of the mutable state
+ formerly in routerinfo_t and routerstatus_t.
diff --git a/changes/policy_summarize-assert b/changes/policy_summarize-assert
deleted file mode 100644
index 619e8e7e4..000000000
--- a/changes/policy_summarize-assert
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes (security)
- - Fix a bounds-checking error that could allow an attacker to
- remotely crash a directory authority. Found by piebeer.
- Bugfix on 0.2.1.5-alpha.
-
-
diff --git a/changes/remove-website b/changes/remove-website
deleted file mode 100644
index ecbfbf9bc..000000000
--- a/changes/remove-website
+++ /dev/null
@@ -1,5 +0,0 @@
- o Removed files:
- - Stop shipping the old doc/website/ directory in the tarball. We
- changed the website format in late 2010, and what we shipped in
- 0.2.1.26 really wasn't that useful anyway.
-
diff --git a/changes/routerparse_maxima b/changes/routerparse_maxima
deleted file mode 100644
index 340f2c3c2..000000000
--- a/changes/routerparse_maxima
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes
- - Check for and reject overly long directory certificates and
- directory tokens before they have a chance to hit any
- assertions. Bugfix on 0.2.1.28. Found by doorss.
diff --git a/changes/security_bug b/changes/security_bug
deleted file mode 100644
index 990beee50..000000000
--- a/changes/security_bug
+++ /dev/null
@@ -1,5 +0,0 @@
- o Major bugfixes:
- - Fix a remotely exploitable bug that could be used to crash instances
- of Tor remotely by overflowing on the heap. Remove-code execution
- hasn't been confirmed, but can't be ruled out. Obviously, everyone
- should upgrade. Bugfix on the 0.1.1 series and later.
diff --git a/changes/task2196 b/changes/task2196
deleted file mode 100644
index e629fccac..000000000
--- a/changes/task2196
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor features:
- - Report only the top 10 ports in exit-port stats in order not to
- exceed the maximum extra-info descriptor length of 50 KB. Implements
- task 2196.
-
diff --git a/changes/tolen_asserts b/changes/tolen_asserts
deleted file mode 100644
index a9834ab66..000000000
--- a/changes/tolen_asserts
+++ /dev/null
@@ -1,8 +0,0 @@
- o Major bugfixes (security)
- - Fix a heap overflow bug where an adversary could cause heap
- corruption. This bug potentially allows remote code execution
- attacks. Found by debuger. Fixes CVE-2011-0427. Bugfix on
- 0.1.2.10-rc.
- o Defensive programming
- - Introduce output size checks on all of our decryption functions.
-
diff --git a/changes/tor-fw-helper b/changes/tor-fw-helper
new file mode 100644
index 000000000..f87d828b8
--- /dev/null
+++ b/changes/tor-fw-helper
@@ -0,0 +1,14 @@
+ o Major features:
+ - Tor now has the ability to wrangle NAT devices like a good network cowbot
+ with the tor-fw-helper tool. The tor-fw-helper tool supports Apple's
+ NAT-PMP protocol and the UPnP standard for TCP port mapping. This
+ optional tool may be enabled at compile time by configuring with
+ '--enable-upnp' or '--enable-natpmp' or with both. This tool may be
+ called by hand or by Tor. By configuring the PortForwarding option, Tor
+ will launch the helper on a regular basis to ensure that the NAT mapping
+ is regularly updated. Additionally, a user may also specify an
+ alternative helper by using the PortForwardingHelper option. The helper
+ may be specified by name or with the full path to the helper. The default
+ helper is named 'tor-fw-helper' and any alternative helper must take the
+ tor-fw-helper-spec.txt into account.
+