aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Collapse)AuthorAge
* Kill warn when picking bridges without bw weightSebastian Hahn2010-09-06
| | | | | | | Bridges and other relays not included in the consensus don't necessarily have a non-zero bandwidth capacity. If all our configured bridges had a zero bw capacity we would warn the user. Change that.
* Merge branch 'ratelim'Nick Mathewson2010-08-31
|\
| * Fix some issues in rate-limiting noticed by SebastianNick Mathewson2010-08-31
| |
| * Add a generic rate-limited log mechanism, and use it in a few placesNick Mathewson2010-08-18
| | | | | | | | Incidentally fixes bug 1042.
* | Fix a compile warning on OpenBSDSebastian Hahn2010-08-22
| |
* | Warn for bad combination of cookie optionsSebastian Hahn2010-08-20
| | | | | | | | | | | | Setting CookieAuthFileGroupReadable but without setting CookieAuthFile makes no sense, because unix directory permissions for the data directory prevent the group from accessing the file anyways.
* | Fix up compilation on windows.Nick Mathewson2010-08-19
| |
* | delay geoip stats even more for relays-turned-bridgesRoger Dingledine2010-08-18
|/
* Merge commit 'origin/maint-0.2.1'Nick Mathewson2010-08-18
|\ | | | | | | | | Conflicts: src/or/reasons.c
| * Backport END_STREAM_REASON_NOROUTE for client use.Sebastian Hahn2010-08-18
| | | | | | | | (Partial backport of 150ed553dfce9, 161b275028e90, and 4c948ffd6.)
* | Merge commit 'karsten/dirbytes2'Nick Mathewson2010-08-18
|\ \ | | | | | | | | | | | | Conflicts: src/or/rephist.h
| * | Correctly report written bytes on linked connections.Karsten Loesing2010-08-18
| | |
| * | Count bytes we spend on answering directory requests.Karsten Loesing2010-08-18
| | |
* | | Remove unused function declarationsSebastian Hahn2010-08-17
| | | | | | | | | | | | | | | | | | Also remove some #if 0'd code from the unit tests for buffers. The code was killed in e6794e58081af773073c266e23fe3ab2ebecdb7e (5 years ago), and is now broken anyways.
* | | Merge branch 'maint-0.2.1'Nick Mathewson2010-08-17
|\ \ \ | | |/ | |/| | | | | | | Resolved conflict in src/or/networkstatus.c
| * | Scale CONSENSUS_MIN_SECONDS_BEFORE_CACHING by voting intervalNick Mathewson2010-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the voting interval was short enough, the two-minutes delay of CONSENSUS_MIN_SECONDS_BEFORE_CACHING would confuse bridges to the point where they would assert before downloading a consensus. It it was even shorter (<4 minutes, I think), caches would assert too. This patch fixes that by having replacing the two-minutes value with MIN(2 minutes, interval/16). Bugfix for 1141; the cache bug could occur since 0.2.0.8-alpha, so I'm calling this a bugfix on that. Robert Hogan diagnosed this. Done as a patch against maint-0.2.1, since it makes it hard to run some kinds of testing networks.
* | | Merge commit 'public/warn1125'Nick Mathewson2010-08-16
|\ \ \
| * | | Make buf_shrink_freelists warn, not crash, when n_to_skip is too highNick Mathewson2010-08-10
| | | | | | | | | | | | | | | | | | | | This mitigates bug 1125, but doesn't fix its root cause (whatever that is).
* | | | Fix compilation with --with-dmallocKarsten Loesing2010-08-16
| | | | | | | | | | | | | | | | Fixes 1832; bugfix on 0.2.2.6-alpha
* | | | 161b2750 didn't really retry the stream. this does.Roger Dingledine2010-08-16
| | | |
* | | | Make Sebastian's bug1831 branch build with --enable-gcc-warningsNick Mathewson2010-08-15
| | | |
* | | | Merge commit 'sebastian/bug1831'Nick Mathewson2010-08-15
|\ \ \ \
| * | | | Fix misplaced labelsSebastian Hahn2010-08-16
| | | | |
| * | | | Fix a memory leak in dirvote_compute_consensuses()Sebastian Hahn2010-08-16
| | | | |
| * | | | Fix a memory leakSebastian Hahn2010-08-16
| | | | | | | | | | | | | | | | | | | | It happened in dirvote_add_signatures_to_pending_consesus().
| * | | | Refactor circuit_build_times_parse_stateSebastian Hahn2010-08-16
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the msg parameter to pass an error message out. This wasn't needed and made it harder to detect a memory leak.
| * | | | Fix a memory leak in circuit_build_times_parse_stateSebastian Hahn2010-08-16
| | | | | | | | | | | | | | | | | | | | Thanks weasel for noticing.
* | | | | Make Sebastian's misc-reasons branch compile; frob the changes fileNick Mathewson2010-08-15
| | | | |
* | | | | Merge commit 'sebastian/misc-reason'Nick Mathewson2010-08-15
|\ \ \ \ \
| * | | | | Retry streams that ended with NOROUTE errorSebastian Hahn2010-08-04
| | | | | | | | | | | | | | | | | | | | | | | | Also add the NOROUTE reason to control-spec.
| * | | | | Introduce END_STREAM_REASON_NOROUTESebastian Hahn2010-08-03
| | | | | |
| * | | | | Handle EHOSTUNREACH in errno_to_stream_end_reason()Sebastian Hahn2010-08-03
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | We used to not recognize it and returned END_STREAM_REASON_MISC. Instead, return END_STREAM_REASON_INTERNAL.
* | | | | Merge commit 'karsten/stats-tests'Nick Mathewson2010-08-15
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Give rep_hist_exit_stats_history() a better name.Karsten Loesing2010-08-15
| | | | |
| * | | | Fix memory leak spotted by Nick.Karsten Loesing2010-08-15
| | | | |
| * | | | Refactor exit port statistics code and add unit tests.Karsten Loesing2010-08-11
| | |_|/ | |/| |
* | | | reinit per-conn token buckets on config or consensus changeRoger Dingledine2010-08-15
| | | |
* | | | factor out rate/burst setting. no actual changes.Roger Dingledine2010-08-15
| | | |
* | | | fix another piece of 1741Roger Dingledine2010-08-14
| | | |
* | | | changes entry for bug 1741Roger Dingledine2010-08-13
| | | |
* | | | Add check for CIRCUIT_PURPOSE_S_REND_JOINED.Mike Perry2010-08-13
| | | | | | | | | | | | | | | | | | | | These circuits stick around much longer than others on the server side for performance reasons. Their lifetime is controlled by the client.
* | | | fix a memory leak introduced by df1ef2f0f0856afRoger Dingledine2010-08-13
| | | |
* | | | minor formatting / comment fixesRoger Dingledine2010-08-13
|/ / /
* | / tiny change i found in my other sandboxRoger Dingledine2010-08-11
| |/ |/|
* | tiny changes i found in my sandboxRoger Dingledine2010-08-09
| |
* | Move exit-stats code to the end of rephist.c.Karsten Loesing2010-08-05
| |
* | Only delay counting bridge users if we were a relay beforeSebastian Hahn2010-08-05
| |
* | Allow enabling or disabling *Statistics while Tor is running.Karsten Loesing2010-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch we stop scheduling when we should write statistics using a single timestamp in run_scheduled_events(). Instead, we remember when a statistics interval starts separately for each statistic type in geoip.c and rephist.c. Every time run_scheduled_events() tries to write stats to disk, it learns when it should schedule the next such attempt. This patch also enables all statistics to be stopped and restarted at a later time. This patch comes with a few refactorings, some of which were not easily doable without the patch.
* | Fix 'make distcheck'Sebastian Hahn2010-08-03
| | | | | | | | | | We were leaving doc/config.log and src/or/micro-revision.i in place during a make clean. Fix that.
* | Merge branch 'bug1384'Nick Mathewson2010-08-02
|\ \