diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-14 17:59:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-14 17:59:42 -0500 |
| commit | cf8117136c1b206e727d582a4c378ce53e058414 (patch) | |
| tree | 87e9d21ec81962574b4ce69283c9c3972f3e4a8a /src/or/status.h | |
| parent | 8592126a184c5f80e3213085d666362f21320df0 (diff) | |
| parent | 0f6c02161793fa1022fe721ed9c1aac3538294b3 (diff) | |
| download | tor-cf8117136c1b206e727d582a4c378ce53e058414.tar.gz tor-cf8117136c1b206e727d582a4c378ce53e058414.zip | |
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.
Diffstat (limited to 'src/or/status.h')
0 files changed, 0 insertions, 0 deletions