]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 15:29:37 +0000 (10:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Nov 2012 15:29:37 +0000 (10:29 -0500)
commitefb644ed87cad093f2b1407bc13648e092367cdc
treec4c0d21277d8e49bd14cdcf1008bbb724908e427
parent4343edf3c6330d38d46a0cb40589c8f7ff105255
parentf3009e48c7b1cde00da44b8af2159278e2394a6a
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
test/rpcgen_wrapper.sh
test/rpcgen_wrapper.sh