[tor-commits] [gettor/master] Merge remote branch 'kaner/bug3920'

[kaner at torproject.org]

commit 734da4b28746bbcd34710ea59e83ba480281d2fe
Merge: 4ce8743 1ebe00e
Author: Christian Fromme <kaner at strace.org>
Date:   Mon Oct 24 17:39:54 2011 +0200

    Merge remote branch 'kaner/bug3920'

 gettor.conf             |    5 +++++
 lib/gettor/i18n.py      |   10 +++++++++-
 lib/gettor/requests.py  |    4 +++-
 lib/gettor/responses.py |   41 +++++++++++++++++++++++++++++++++++++++--
 lib/gettor/utils.py     |   34 +++++++++++++++++++++++++++++-----
 5 files changed, 85 insertions(+), 9 deletions(-)