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

[nickm at torproject.org]

commit 43b81325b5782ce7986421bdfefae57cd4c8ab81
Merge: 5919e8e ae75fb1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 31 11:49:32 2012 -0400

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

 Makefile.am              |   33 +++++++++++++--------------
 changes/bug6043          |    6 +++++
 doc/tor-rpm-creation.txt |   56 +++++++++++++++++++++++++++++++++++----------
 tor.spec.in              |   27 +++++++++++++---------
 4 files changed, 81 insertions(+), 41 deletions(-)