]> git.ipfire.org Git - thirdparty/tor.git/commit
projects / thirdparty / tor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8592126 0f6c021)
Merge remote-tracking branch 'public/bug4457_022' into bug4457_master
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 22:59:42 +0000 (17:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Nov 2011 22:59:42 +0000 (17:59 -0500)
commitcf8117136c1b206e727d582a4c378ce53e058414
tree87e9d21ec81962574b4ce69283c9c3972f3e4a8atree | snapshot
parent8592126a184c5f80e3213085d666362f21320df0commit | diff
parent0f6c02161793fa1022fe721ed9c1aac3538294b3commit | diff
Merge remote-tracking branch 'public/bug4457_022' into bug4457_master

Conflicts:
src/common/compat_libevent.c

Resolving conflict by not taking 7363eae13cb8 ("Use the
EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation"): in
Tor 0.2.3.x, we _do_ sometimes use notifiable event bases.
src/common/compat_libevent.c diff1 | diff2 | blob | history
Mirror of https://git.torproject.org/tor.git