summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix bug #4528 read_to_buf_tls(): Inconsistency in codeHEADmasterbug4528Arturo Filastò2012-02-22
|
* Merge branch 'master' of https://git.torproject.org/torArturo Filastò2012-02-21
|\
| * Merge remote-tracking branch 'sebastian/bug5161'Nick Mathewson2012-02-20
| |\
| | * Don't redeclare environ if std headers already didSebastian Hahn2012-02-19
| | | | | | | | | | | | | | | This would cause a redundant redeclaration warning on some versions of Linux otherwise.
| * | Merge remote-tracking branch 'pmezard/armv5'Nick Mathewson2012-02-20
| |\ \
| | * | Fix off-by-one error in test_util_make_environmentPatrick Mézard2012-02-20
| | |/
| * | Fix crypto_hmac_sha256 documentation commentRobert Ransom2012-02-20
| |/
| * document a cool attack that we evaluatedRoger Dingledine2012-02-17
| |
| * Use get_environment(), not environ.Nick Mathewson2012-02-17
| |
| * Merge branch 'bug5105-v2-squashed'Nick Mathewson2012-02-17
| |\ | | | | | | | | | | | | Conflicts: src/or/transports.c
| | * Add unit tests for easily tested, non-trivial utility functionsRobert Ransom2012-02-17
| | |
| | * Heap-allocate strings returned by get_current_process_environment_variablesRobert Ransom2012-02-17
| | |
| | * Pass process_environment_t * to tor_spawn_backgroundRobert Ransom2012-02-17
| | | | | | | | | | | | Now tor_spawn_background's prototype is OS-independent.
| | * Remove (void)envp from tor_spawn_backgroundRobert Ransom2012-02-17
| | | | | | | | | | | | The envp argument is used on Windows.
| | * Rewrite managed proxy environment setup codeRobert Ransom2012-02-17
| | | | | | | | | | | | | | | Now, the environment setup is entirely OS-independent, as well as less hacky and brittle.
| | * Change type of unixoid_environment_block to match tor_spawn_background's argRobert Ransom2012-02-17
| | |
| | * Add set_environment_variable_in_smartlistRobert Ransom2012-02-17
| | |
| | * Add get_current_process_environment_variablesRobert Ransom2012-02-17
| | |
| | * Add process_environment_make and related utilitiesRobert Ransom2012-02-17
| | |
| | * Add tor_callocRobert Ransom2012-02-17
| | |
| * | Merge remote-tracking branch 'asn/bug4725_take2'Nick Mathewson2012-02-16
| |\ \
| | * | Add a belated changes file for #4725.George Kadianakis2012-02-15
| | | |
| * | | Downgrade "Registered server transport" msg to notice. Bug 5136Nick Mathewson2012-02-15
| | | |
| * | | Include compat.h from natpmp-helper to fix buildSebastian Hahn2012-02-14
| | | | | | | | | | | | | | | | This means tor_socket_t is declared.
| * | | Use _NSGetEnviron() instead of environ where requiredSebastian Hahn2012-02-14
| | | | | | | | | | | | | | | | | | | | OS X would otherwise crash with a segfault when linked statically to some libraries.
| * | | Make ht.h conform to Tor's code style againSebastian Hahn2012-02-14
| | | | | | | | | | | | | | | | | | | | When porting over changes from libevent, a bunch of tabs and a couple of long lines got introduced.
| * | | Port over the last ht.h changes from libevent: avoid _reserved identifiersNick Mathewson2012-02-13
| | | |
| * | | Port over ht.h improvements from Libevent.Nick Mathewson2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a facility (not used now in Tor) to avoid storing the hash of a given type if it is a fast-to-calculate hash. There are also a few ancient-openbsd compilation issues fixed here. The fact that Tor says INLINE while Libevent says inline remains unaddressed.
| * | | ht.h comment tweaks, upstreamed from libeventNick Mathewson2012-02-13
| | | |
| * | | Oops; there were a couple of typos in the upstream tinytestNick Mathewson2012-02-13
| | | |
| * | | Synchronize with upstream tinytest again: remove _identifiersNick Mathewson2012-02-13
| | | |
| * | | Synchronize with upstream tinytest.Nick Mathewson2012-02-13
| | | | | | | | | | | | | | | | | | | | | | | | The big change here is a patch (first added to Libevent by Ed Day) to make sure that the CreateProcess forked-test trick works even when the main test program is invoked without its .exe suffix.
| * | | bump to 0.2.3.12-alpha-devRoger Dingledine2012-02-13
| | | |
| * | | add a release blurb for 0.2.3.12-alphaRoger Dingledine2012-02-13
| | |/ | |/|
| * | bump to 0.2.3.12-alphaRoger Dingledine2012-02-13
| | |
| * | today is the day for a 0.2.3.12-alpha releaseRoger Dingledine2012-02-13
| | |
| * | revise changelog entry for 5097 tooRoger Dingledine2012-02-13
| | |
| * | Merge branch 'tmp'Roger Dingledine2012-02-13
| |\ \
| | * | Reinstate TOR_PR_EXTENDED_SERVER_PORT, just a littleNick Mathewson2012-02-13
| | | |
| * | | integrate recent changes filesRoger Dingledine2012-02-12
| |/ /
| * | Merge branch 'bug5082_squashed'Nick Mathewson2012-02-12
| |\ \
| | * | set_managed_proxy_environment() can't fail anymoreSebastian Hahn2012-02-12
| | | | | | | | | | | | | | | | | | | | It already couldn't fail on Windows, now it can't fail on non-Windows, either.
| | * | Properly set up environment for managed-mode obfsproxySebastian Hahn2012-02-12
| |/ /
| * | Merge branch 'bug5084_squashed'Nick Mathewson2012-02-12
| |\ \
| | * | Add a changes file for bug5084Nick Mathewson2012-02-12
| | | |
| | * | Try to have (and maintain!) an invariant about unconfigured_proxies_nNick Mathewson2012-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invariant is: unconfigured_proxies_n is exactly the number of managed_proxy_t not in state PT_PROTO_COMPLETED. To maintain this, we need to stop overloading unconfigured_proxies_n to also count managed_proxy_t items that are in PT_PROTO_COMPLETED but which might need relaunching. To make it so we can detect those, we introduce another variable. This commit also adds a function to assert that we haven't broken the invariant. Fix for bug 5084; bugfix on 0.2.3.6-alpha, I think.
| | * | Don't smartlist_remove a managed proxy from a list we're iterating over.Nick Mathewson2012-02-12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In some cases, we solve this by doing a SMARTLIST_DEL_CURRENT before calling managed_proxy_destroy. But for a trickier one, we just make a copy of the list before iterating over it, so that changes to the manage proxy list don't hurt our iteration. This could be related to bug 5084.
| * | Fix a check-spaces complaintSebastian Hahn2012-02-12
| | |
| * | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-02-12
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/Makefile.am src/or/Makefile.am
| | * | Properly protect paths to sed, sha1sum, opensslSebastian Hahn2012-02-10
| | | | | | | | | | | | | | | | | | | | | | | | in Makefile.am, we used it without quoting it, causing build failure if your openssl/sed/sha1sum happened to live in a directory with a space in it (very common on windows)