aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-03 17:25:30 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-03 17:25:30 -0500
commitfd8f7991e47d02cc345af6f190a7b480703822df (patch)
treed8b85b760feeca52e57bd8da9d768ad7c124cc4e /changes
parenta87a55a9b692ab9f039be15f8af59a159b52d8f2 (diff)
parent0e9d7f105d217e88b87058fabb31c94e4f72762c (diff)
downloadtor-fd8f7991e47d02cc345af6f190a7b480703822df.tar.gz
tor-fd8f7991e47d02cc345af6f190a7b480703822df.zip
Merge remote branch 'origin/maint-0.2.2'
Conflicts: Makefile.am
Diffstat (limited to 'changes')
-rw-r--r--changes/bug23055
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug2305 b/changes/bug2305
new file mode 100644
index 0000000000..c979d5fd3a
--- /dev/null
+++ b/changes/bug2305
@@ -0,0 +1,5 @@
+ 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.
+