Merge branch 'maint-0.2.3' into release-0.2.3
commit33c82ebf51cf2dc106e5de788111e775533aa76a
authorRoger Dingledine <arma@torproject.org>
Tue, 4 Sep 2012 23:05:31 +0000 (4 19:05 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 4 Sep 2012 23:05:31 +0000 (4 19:05 -0400)
treea6d0ba28e237bc1ed39b203132b9b6ede5559ae8
parentf5541ea4fe0aabe1d2aba49de43a08bbf4cd6bad
parent4bd90e20b92fbe2b93fc53e24254f00e663d057e
Merge branch 'maint-0.2.3' into release-0.2.3
configure.in