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

[nickm at torproject.org]

commit 05dd0a9cd9055f0d7cc847ea0c9b5181b9c20057
Merge: 4050800 5fad3dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 11:03:32 2012 -0400

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

 changes/clang_strcspn |    3 +++
 changes/envvar_test   |    2 ++
 src/common/util.c     |   21 +++++++++++++++++----
 src/test/test_util.c  |   34 ++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)