aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-18
|\
| * Merge branch 'smartlist_shorten' into maint-0.2.3Nick Mathewson2012-07-18
| |\
| | * Tweaks to 6400 changes file and docs as suggested by armaNick Mathewson2012-07-18
| | |
| | * Fix the remaining instances of nexted SMARTLIST_FOREACHNick Mathewson2012-07-17
| | |
| | * Change all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/ENDNick Mathewson2012-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SMARTLIST_FOREACH macro is more convenient than BEGIN/END when you have a nice short loop body, but using it for long bodies makes your preprocessor tell the compiler that all the code is on the same line. That causes grief, since compiler warnings and debugger lines will all refer to that one line. So, here's a new style rule: SMARTLIST_FOREACH blocks need to be short.
* | | Merge remote-tracking branch 'asn/bug3589'Nick Mathewson2012-07-17
|\ \ \
| * | | Address Nick's comments.George Kadianakis2012-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a changes/ file. - Make it compile under --enable-gcc-warnings. - Update the file-level documentation of src/or/transports.c. - Only update descriptor if at least a managed proxy was configured. - Add our external IP address to the extra-info descriptor instead of 0.0.0.0.
| * | | Change extra-info "method" to "transport".George Kadianakis2012-07-03
| | | |
| * | | Mark descriptor as dirty if all managed proxies are configured.George Kadianakis2012-07-03
| | | |
| * | | Add pluggable transport info to extra-info descriptors.George Kadianakis2012-07-03
| | | |
| * | | Constify some functions.George Kadianakis2012-07-03
| | | |
| * | | Make some transports.c functions static.George Kadianakis2012-07-03
| | | | | | | | | | | | | | | | - Also reorder functions.
| * | | Refactor mp->transports to use transport_t.George Kadianakis2012-07-03
| | | |
| * | | Introduce a transport_t deep copy function.George Kadianakis2012-07-03
| | | |
| * | | Move transport-related functions from circuitbuild.c to transports.c.George Kadianakis2012-07-03
| | | | | | | | | | | | | | | | | | | | Move 'transport_t' to transports.h, and all transport-related functions that don't rely on 'bridge_list' to transports.c.
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-17
|\ \ \ \ | | |/ / | |/| |
| * | | Improve message on spurious SOCKSListenAddressNick Mathewson2012-07-17
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-17
|\| |
| * | Allow TestingTorNetwork when alternate dir and bridge authorities are set.Linus Nordberg2012-07-17
| | | | | | | | | | | | | | | Allow TestingTorNetwork when AlternateDirAuthority and AlternateBridgeAuthority is set even if DirServer is not.
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-16
|\| |
| * | Refer to the correct variable in a loop when parsing entry guard stateNick Mathewson2012-07-16
| | | | | | | | | | | | Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta.
| * | Coverity 709056: Check return value on fputs in tor-gencertNick Mathewson2012-07-16
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-16
|\| |
| * | Improve Alternate*Authority docs. Bug 6387.Nick Mathewson2012-07-16
| | |
* | | forward-port the 0.2.3.19-rc changelogRoger Dingledine2012-07-07
| | |
* | | Merge branch 'maint-0.2.3'Roger Dingledine2012-07-06
|\| |
| * | Merge branch 'maint-0.2.2' into maint-0.2.3Roger Dingledine2012-07-06
| |\ \
| | * | Revert to the May 2012 geoip dbRoger Dingledine2012-07-06
| | | | | | | | | | | | | | | | | | | | The June 2012 db marks too many relays as country "A1". Addresses bug 6334.
* | | | Merge branch 'maint-0.2.3'Roger Dingledine2012-07-06
|\| | |
| * | | Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3Roger Dingledine2012-07-06
| |\ \ \
| | * | | Fix a bug handling SENDME cells on nonexistent streams.Nick Mathewson2012-07-06
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could result in bizarre window values. Report and patch contributed pseudymously. Fixes part of bug 6271. This bug was introduced before the first Tor release, in svn commit r152. (bug 6271, part a.)
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-06
|\| | |
| * | | Fix port range in parse_port_range().George Kadianakis2012-07-06
| | | |
* | | | Fix compilation on 32-bit. Fix for bug 6277, not in any released tor.Nick Mathewson2012-07-05
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-07-05
|\| | | | |_|/ |/| |
| * | On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rcNick Mathewson2012-07-05
| | |
* | | Merge branch 'maint-0.2.3'Roger Dingledine2012-07-01
|\| |
| * | Revert "Detect bug 6252 (unexpected sendme cell)"Roger Dingledine2012-07-01
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c32ec9c425e9539bcc8ede95612e2d331c2cc2dd. It turns out the two sides of the circuit don't actually stay in sync, so it is perfectly normal for the circuit window on the exit relay to grow to 2000+. We should fix that bug and then reconsider this patch.
* | | Merge branch 'maint-0.2.3'Roger Dingledine2012-07-01
|\| |
| * | Detect bug 6252 (unexpected sendme cell)Roger Dingledine2012-07-01
| | | | | | | | | | | | | | | | | | | | | | | | I only check on circuits, not streams, since bloating your stream window past the initial circuit window can't help you much. Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising races if we lower CIRCWINDOW_START for an experiment.
* | | Merge branch 'bug6255'Nick Mathewson2012-06-29
|\ \ \
| * | | Fix crash bug from 4a8eaad7 (Bug 6255)Nick Mathewson2012-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing a tor_strclear() on client_keys_str when it might not even be set. Fix for bug 6255; bug not in any release of Tor. Thanks to katmagic for finding this one!
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-29
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | bump version to 0.2.3.18-rc-devNick Mathewson2012-06-28
| | |
* | | Fix clang warning on d4285f03df475dc. Not in any released tor.Nick Mathewson2012-06-29
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-06-28
|\| |
| * | bump to 0.2.3.18-rcRoger Dingledine2012-06-28
| | |
* | | Merge commit '81cd3d7ad641a8dbf'Nick Mathewson2012-06-28
|\| |
| * | add a blurb for 0.2.3.18-rc, other minor cleanupsRoger Dingledine2012-06-28
| | |
| * | fix grammar in commentRoger Dingledine2012-06-28
| | |