| Commit message (Expand) | Author | Age |
|---|
| * | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts:
src/common/compat.c
src/or/main.c
| Nick Mathewson | 2011-05-30 |
| |\ |
|
| | * | Merge remote-tracking branch 'public/bug3270' into maint-0.2.2 | Nick Mathewson | 2011-05-30 |
| | |\ |
|
| | | * | Use a 64-bit type to hold sockets on win64.•••On win64, sockets are of type UINT_PTR; on win32 they're u_int;
elsewhere they're int. The correct windows way to check a socket for
being set is to compare it with INVALID_SOCKET; elsewhere you see if
it is negative.
On Libevent 2, all callbacks take sockets as evutil_socket_t; we've
been passing them int.
This patch should fix compilation and correctness when built for
64-bit windows. Fixes bug 3270.
| Nick Mathewson | 2011-05-23 |
| * | | | Fix a -Wunused-but-set-variable instance in master | Nick Mathewson | 2011-05-28 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-23 |
| |\| | |
|
| | * | | Unbreak the build on libevent 1.x systems | Robert Ransom | 2011-05-22 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts:
src/common/Makefile.am
src/or/control.c
| Nick Mathewson | 2011-05-23 |
| |\| | |
|
| | * | | Merge branch 'feature3049-v2' into maint-0.2.2•••Conflicts:
src/common/Makefile.am
| Nick Mathewson | 2011-05-23 |
| | |\ \
| | |/
| |/| |
|
| | | * | The first argument for a libevent callback should be evutil_socket_t | Nick Mathewson | 2011-05-23 |
| | | * | Appease make check-spaces wrt procmon.h | Nick Mathewson | 2011-05-23 |
| | | * | Fix some comments | Robert Ransom | 2011-05-20 |
| | | * | Implement __OwningControllerProcess option•••Implements part of feature 3049.
| Robert Ransom | 2011-05-20 |
| | | * | Improve a documentation comment | Robert Ransom | 2011-05-12 |
| | | * | Fix comment typo | Robert Ransom | 2011-05-12 |
| | | * | Fix comment typo | Robert Ransom | 2011-05-10 |
| * | | | Merge branch 'maint-0.2.2' | Roger Dingledine | 2011-05-21 |
| |\| | |
|
| | * | | what's up with this trailing whitespace | Roger Dingledine | 2011-05-20 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-16 |
| |\| | |
|
| | * | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2•••Fixed trivial conflict due to headers moving into their own .h files
from or.h.
Conflicts:
src/or/or.h
| Nick Mathewson | 2011-05-16 |
| | |\ \ |
|
| | | * | | squash! Add crypto_pk_check_key_public_exponent function•••Rename crypto_pk_check_key_public_exponent to crypto_pk_public_exponent_ok:
it's nice to name predicates s.t. you can tell how to interpret true
and false.
| Nick Mathewson | 2011-05-16 |
| | | * | | Add crypto_pk_check_key_public_exponent function | Robert Ransom | 2011-05-16 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
| |\| | | |
|
| | * | | | Increase the length of the buffer in smartlist_string_num_isin().•••This was harmless, since we only used this for checking for lists of
port values, but it's the principle of the thing.
Fixes 3175; bugfix on 0.1.0.1-rc
| Nick Mathewson | 2011-05-15 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
| |\| | | |
|
| | * | | | Make check_private_dir check for group ownership as appropriate | Nick Mathewson | 2011-05-15 |
| | * | | | Fix up some comment issues spotted by rransom | Nick Mathewson | 2011-05-15 |
| | * | | | Add a new flag to check_private_dir to make it _not_ change permissions•••We'll need this for checking permissions on the directories that hold
control sockets: if somebody says "ControlSocket ~/foo", it would be
pretty rude to do a chmod 700 on their homedir.
| Nick Mathewson | 2011-05-15 |
| | * | | | Add a function to pull off the final component of a path | Nick Mathewson | 2011-05-15 |
| | * | | | Make check_private_dir accept g+rx dirs if told to do so. | Nick Mathewson | 2011-05-15 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
| |\| | | |
|
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts:
src/or/networkstatus.c
| Nick Mathewson | 2011-05-15 |
| | |\| | |
|
| | | * | | Fixup whitespace issues from 3122 commit | Nick Mathewson | 2011-05-15 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-15 |
| |\| | | |
|
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 | Nick Mathewson | 2011-05-15 |
| | |\| | |
|
| | | * | | Another doc tweak on tor_memcmp: <b>b</b>, not <b>. | Nick Mathewson | 2011-05-15 |
| | | * | | minor tweaks to 4b19730c8234d | Roger Dingledine | 2011-05-15 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts:
src/or/connection_edge.c
| Nick Mathewson | 2011-05-15 |
| |\| | | |
|
| | * | | | New smartlist function to see if two lists of strings are equal.•••We'll use this to detect changes in CSV options.
| Nick Mathewson | 2011-05-13 |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
| Nick Mathewson | 2011-05-13 |
| |\| | | |
|
| | * | | | Add a new "tor_sockaddr_to_str()" function•••It does what it says on the tin. It turns out I'll want this in a couple
of places.
| Nick Mathewson | 2011-05-13 |
| * | | | | Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023•••Conflicts in various places, mainly node-related. Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.
src/common/Makefile.am
src/or/circuitlist.c
src/or/connection_edge.c
src/or/directory.c
src/or/microdesc.c
src/or/networkstatus.c
src/or/router.c
src/or/routerlist.c
src/test/test_util.c
| Nick Mathewson | 2011-05-11 |
| |\| | | |
|
| | * | | | Re-apply the automated conversion to 0.2.2 to make handle any memcmps that sn... | Nick Mathewson | 2011-05-11 |
| | * | | | Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcm...•••Conflicts throughout. All resolved in favor of taking HEAD and
adding tor_mem* or fast_mem* ops as appropriate.
src/common/Makefile.am
src/or/circuitbuild.c
src/or/directory.c
src/or/dirserv.c
src/or/dirvote.c
src/or/networkstatus.c
src/or/rendclient.c
src/or/rendservice.c
src/or/router.c
src/or/routerlist.c
src/or/routerparse.c
src/or/test.c
| Nick Mathewson | 2011-05-11 |
| | |\| |
| | |/
| |/| |
|
| | | * | Hand-conversion and audit phase of memcmp transition•••Here I looked at the results of the automated conversion and cleaned
them up as follows:
If there was a tor_memcmp or tor_memeq that was in fact "safe"[*] I
changed it to a fast_memcmp or fast_memeq.
Otherwise if there was a tor_memcmp that could turn into a
tor_memneq or tor_memeq, I converted it.
This wants close attention.
[*] I'm erring on the side of caution here, and leaving some things
as tor_memcmp that could in my opinion use the data-dependent
fast_memcmp variant.
| Nick Mathewson | 2011-05-11 |
| | | * | Automated conversion of memcmp to tor_memcmp/tor_mem[n]eq•••This commit is _exactly_ the result of
perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch]
perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch]
perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch]
git checkout src/common/di_ops.[ch]
git checkout src/or/test.c
git checkout src/common/test.h
| Nick Mathewson | 2011-05-11 |
| | | * | Add a "di_ops.h" include to util.h | Nick Mathewson | 2011-05-11 |
| | | * | Add a data-independent variant of memcmp and a d-i memeq function.•••The tor_memcmp code is by Robert Ransom, and the tor_memeq code is
by me. Both incorporate some ideas from DJB's stuff.
| Nick Mathewson | 2011-05-11 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-05-05 |
| |\| | |
|
| | * | | Fix up some check-spaces issues | Nick Mathewson | 2011-05-05 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-04-28 |
| |\| | |
|