[tor-commits] [tor/master] Merge branch 'master' of ssh://git-rw.torproject.org/tor

[nickm at torproject.org]

commit 4bbd6a27612e8e48c593dd0683294a980ecb8484
Merge: 9919b01 694cd7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 24 16:48:01 2011 -0400

    Merge branch 'master' of ssh://git-rw.torproject.org/tor

 ChangeLog |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)