fold in the pending changes
commit32ca2bd0f5ad21265724fe88385e97d1393e3a21
authorRoger Dingledine <arma@torproject.org>
Sun, 21 Nov 2010 22:47:03 +0000 (21 17:47 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 21 Nov 2010 22:47:03 +0000 (21 17:47 -0500)
tree9b953bc1c5f1bf2a0d1962c64c23cac72aea7db5
parent64d1b8364e41bbee5a7d8a5c02860b30aede41e7
fold in the pending changes
17 files changed:
ChangeLog
changes/annotations_fix [deleted file]
changes/bug1125 [deleted file]
changes/bug1141 [deleted file]
changes/bug1840 [deleted file]
changes/bug1981 [deleted file]
changes/bug2050 [deleted file]
changes/fix2204 [deleted file]
changes/geoip-oct2010 [deleted file]
changes/geoip-sep2010 [deleted file]
changes/geoip-update-august2010 [deleted file]
changes/geoip-update-june2010 [deleted file]
changes/maatuska-new-v3auth [deleted file]
changes/misc-reason [deleted file]
changes/new-geoip-db [deleted file]
changes/openbsd-sysheaders [deleted file]
changes/remove-debian [deleted file]