commit 46f36f3d628c9e8a87f2a55aaf362ad33c01ac97 Merge: ba3b03d ebb287c Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx> Date: Wed Jan 26 11:18:13 2011 -0500 Merge-forward our exit-notice backport (empty merge)