commit ab1460f3ae00f6caab9feead455eebfb0d03d5e4 Merge: 0ee524b 9a490bb Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 20:33:16 2011 -0400

Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2

src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)