summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | Merge remote-tracking branch 'sebastian/bug3047'Nick Mathewson2011-05-02
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't choose exit nodes without desc availableSebastian Hahn2011-04-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | n_supported[i] has a random value prior to initialization, so a node that doesn't have routerinfo available can have a random priority. Patch contributed by wanoskarnet from #tor. Thanks!
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-02
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha processNick Mathewson2011-05-02
| | | | | | | |
* | | | | | | | Make findMergedChanges.pl print a usage msg when started with no argsNick Mathewson2011-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise I need to figure out what it does and how to make it do it every time I want to use it. It did that unixy thing where running it with no arguments printed nothing and returned.
* | | | | | | | Remove changes files that were merged to changelogs of 0.2.2.25-alpha or earlierNick Mathewson2011-04-29
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Clean up a warning a bitNick Mathewson2011-04-29
| | | | | | | |
| * | | | | | | add another heuristic for changes stanzasRoger Dingledine2011-04-29
| | | | | | | |
| * | | | | | | Update hacking file with terse notes on formatting changelogNick Mathewson2011-04-28
| | |_|/ / / / | |/| | | | |
* | | | | | | Add 0.2.2.25-alpha changelog on masterNick Mathewson2011-04-28
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2Nick Mathewson2011-04-28
| |\ \ \ \ \ \
| | * | | | | | relays checkpoint their state file twice a dayRoger Dingledine2011-04-28
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2Nick Mathewson2011-04-28
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | stop putting wacky values into state->lastwrittenRoger Dingledine2011-04-28
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Clarify comment to say which version fixed 2722Nick Mathewson2011-04-28
| | | | | | | |
| | | | | | | |
| | \ \ \ \ \ \
| *-. \ \ \ \ \ \ Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into ↵Nick Mathewson2011-04-28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maint-0.2.2
| | | * | | | | | | Add an XXX to the DA code regarding bug 2722Robert Ransom2011-04-18
| | | | | | | | | |
| | * | | | | | | | Add changes file for previous commitRobert Ransom2011-03-12
| | | | | | | | | |
| | * | | | | | | | Revert "If we are not using BEGIN_DIR cells, don't attempt to contact hidden ↵Robert Ransom2011-03-12
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service directories with non-open dir port." This reverts commit 9a7098487b2c25f36112b3521758f42621dcd6af. Conflicts: ChangeLog (left unchanged by this commit)
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2Nick Mathewson2011-04-28
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Correctly check elapsed time in last hibernation periodSebastian Hahn2011-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 3020.
| * | | | | | | | fix a function commentRoger Dingledine2011-04-28
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2Nick Mathewson2011-04-28
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid false positives from proxy_mode()Nick Mathewson2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would erroneously return true if ListenAddr was set for a client port, even if that port itself was 0. This would give false positives, which were not previously harmful... but which were about to become.
| | * | | | | | | Fix bug 1930Robert Ransom2011-04-28
| | | | | | | | |
| | * | | | | | | Ignore SIGNAL NEWNYM on relay-only Tor instancesRobert Ransom2011-04-28
| | | | | | | | |
| | * | | | | | | Don't allow v0 HS auths to act as clientsRobert Ransom2011-04-28
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A v0 HS authority stores v0 HS descriptors in the same descriptor cache that its HS client functionality uses. Thus, if the HS authority operator clears its client HS descriptor cache, ALL v0 HS descriptors will be lost. That would be bad.
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Correct the logic from f14754fbd for tor_gmtime_rJohn Brooks2011-04-28
| | | | | | | |
| * | | | | | | Detect and handle NULL returns from (gm/local)time_rNick Mathewson2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions can return NULL for otherwise-valid values of time_t. Notably, the glibc gmtime manpage says it can return NULL if the year if greater than INT_MAX, and the windows MSDN gmtime page says it can return NULL for negative time_t values. Also, our formatting code is not guaranteed to correctly handle years after 9999 CE. This patch tries to correct this by detecting NULL values from gmtime/localtime_r, and trying to clip them to a reasonable end of the scale. If they are in the middle of the scale, we call it a downright error. Arguably, it's a bug to get out-of-bounds dates like this to begin with. But we've had bugs of this kind in the past, and warning when we see a bug is much kinder than doing a NULL-pointer dereference. Boboper found this one too.
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2Nick Mathewson2011-04-28
| |\ \ \ \ \ \ \
| | * | | | | | | Don't report empty bw-history lines in extrainfoSebastian Hahn2011-04-19
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tor relays would report lines like these in their extrainfo documents: dirreq-write-history 2011-03-14 16:46:44 (900 s) This was confusing to some people who look at the stats. It would happen whenever a relay first starts up, or when a relay has dirport disabled. Change this so that lines without actual bw entries are omitted. Implements ticket 2497.
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/rendcommon.h
| * | | | | | | Clean up merge of bug3k_021Robert Ransom2011-04-28
| | | | | | | |
| * | | | | | | Merge branch 'bug3k_021' into bug3k_022Sebastian Hahn2011-04-28
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | | | | | | | Conflicts: src/or/or.h src/or/rendclient.c
| | * | | | | Fix a failure case of connection_ap_handshake_attach_circuit()Sebastian Hahn2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tor_fragile_assert() might be a no-op, so we have to return something here to indicate failure to the caller.
| | * | | | | Fix a bug introduced by purging rend_cache on NEWNYMRobert Ransom2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user sent a SIGNAL NEWNYM command after we fetched a rendezvous descriptor, while we were building the introduction-point circuit, we would give up entirely on trying to connect to the hidden service. Original patch by rransom slightly edited to go into 0.2.1
| | * | | | | Allow rend_client_send_introduction to fail transientlyRobert Ransom2011-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e. without closing the AP connection.
| | * | | | | Forget all rendezvous client state on SIGNAL NEWNYMRobert Ransom2011-04-28
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-04-27
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/torint.h
| | * | | | | Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILINGNick Mathewson2011-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the comparisons were _broken_ previously, but avoiding signed/unsigned comparisons makes everybody happier. Fixes bug2475.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-27
|\ \ \ \ \ \ \ | |/ / / / / /