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

commit 1772782e425734967981b79be1122017ef606dd0 Merge: d04bf66 6d595fa Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 18 15:29:41 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4533_part2 | 5 +++++ src/common/compat.h | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)