[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 58eb3e405d5b7e2a74bd5813e3d3f54ab543bcda
Merge: 96746e3 aad4048
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 28 11:05:52 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 Makefile.am |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)