[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
commit de1c36ff6062ee4b45e1e1f637a7f168e104d7b1
Merge: 9d2b384 32341ac
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Wed Apr 6 16:15:48 2011 -0400
Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits