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

[nickm at torproject.org]

commit e12eba55b27ec3ecf0dac586f1eb3adc4b373ca0
Merge: 86197df 23f2e37
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 23:45:59 2012 -0400

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

 ChangeLog                       |   59 +++++++++++++++++++++++++++++++++++++++
 changes/bug3311                 |    5 ---
 changes/bug4748                 |    4 --
 changes/bug5099                 |    3 --
 changes/bug5557                 |    3 --
 changes/bug5932                 |    3 --
 changes/bug6028                 |    4 --
 changes/bug6169                 |    4 --
 changes/bug6173                 |    5 ---
 changes/bug6203                 |    5 ---
 changes/bug6211                 |    4 --
 changes/bug6226                 |    3 --
 changes/bug6227                 |    3 --
 changes/bug6238                 |    3 --
 changes/bug6244                 |    4 ++
 changes/check_correct_flav_sigs |    4 --
 changes/clang_strcspn           |    3 --
 changes/descriptor_limit        |    2 -
 changes/envvar_test             |    2 -
 changes/log_bad_md_entry        |    3 --
 changes/move_cached_gtod        |    3 --
 src/or/control.c                |   18 +++++++++--
 22 files changed, 77 insertions(+), 70 deletions(-)