[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'sebastian/bug5149'

[nickm@xxxxxxxxxxxxxx]

commit 459f5b82bd82a0333c262aaaf7b37b8610a674d0
Merge: 35941b7 f4f3ed0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 16 15:18:02 2012 -0500

    Merge remote-tracking branch 'sebastian/bug5149'

 Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits