aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Expand)AuthorAge
* Merge branch 'bug8746_v2_squashed'Nick Mathewson2014-06-14
|\
| * New waitpid-handler functions to run callbacks when a child exits.Nick Mathewson2014-06-14
* | Merge branch 'bug12184_diagnostic_squashed'Nick Mathewson2014-06-14
|\ \
| * | Try to diagnose bug 12184Nick Mathewson2014-06-14
* | | Merge branch 'bug12191_squashed'Nick Mathewson2014-06-13
|\ \ \
| * | | Also raise the check for 0 circuit ID in created cell.Nick Mathewson2014-06-13
| * | | Move circuit-id-in-use check for CREATE cells to before all other checksNick Mathewson2014-06-10
| |/ /
* | | sandbox: Permit stat() of DataDir/statsNick Mathewson2014-06-13
* | | whitespaces fixesNick Mathewson2014-06-11
* | | Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'Nick Mathewson2014-06-11
|\ \ \
| * | | Replace last_added_nonpadding with last_had_circuitsNick Mathewson2014-06-11
| * | | Give each or_connection_t a slightly randomized idle_timeoutNick Mathewson2014-06-11
* | | | Merge remote-tracking branch 'public/bug11970'Nick Mathewson2014-06-11
|\ \ \ \
| * | | | sandbox: revamp sandbox_getaddrinfo cacheingNick Mathewson2014-05-22
* | | | | Merge remote-tracking branch 'public/not_bug8093'Nick Mathewson2014-06-11
|\ \ \ \ \
| * | | | | Bulletproof our 11246 fix a little, based on recommendation from andrea.Nick Mathewson2014-06-04
| * | | | | count DATA cells with stream ID 0 as delivered for SENDME purposesNick Mathewson2013-03-22
* | | | | | Improved diagnostic log for bug 8387.Nick Mathewson2014-06-10
| |_|_|/ / |/| | | |
* | | | | Merge remote-tracking branch 'public/bug12169_relay_check'Nick Mathewson2014-06-04
|\ \ \ \ \
| * | | | | Use uint32 !=, not tor_memneq, for relay cell integrity checkingNick Mathewson2014-06-01
* | | | | | Merge remote-tracking branch 'andrea/bug10616'Nick Mathewson2014-06-04
|\ \ \ \ \ \
| * | | | | | Squelch spurious LD_BUG message in connection_ap_handshake_socks_reply()Andrea Shepard2014-06-03
| |/ / / / /
* | | | | | Merge remote-tracking branch 'public/bug12195'Nick Mathewson2014-06-04
|\ \ \ \ \ \
| * | | | | | Fix ancient code that only checked circ_id, not circ_id and chanNick Mathewson2014-06-03
* | | | | | | Don't try to fetch bridge descriptors when DisableNetwork is setNick Mathewson2014-06-02
* | | | | | | Merge remote-tracking branch 'public/bug12170_024_v2'Nick Mathewson2014-06-02
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Avoid needless router_dir_info_has_changed from router_set_statusNick Mathewson2014-06-02
| |/ / / / /
* | | | | | sandbox: Allow DirPortFrontPage unconditionally if it's setNick Mathewson2014-05-27
* | | | | | sandbox: Correct fix for hs part of 12064Nick Mathewson2014-05-23
* | | | | | Merge branch 'bug11965_v2'Nick Mathewson2014-05-23
|\ \ \ \ \ \
| * | | | | | Postpone fetches based on should_delay_dir_fetch(), not DisableNetworkNick Mathewson2014-05-23
* | | | | | | sandbox: allow reading of hidden service configuration files.Nick Mathewson2014-05-22
* | | | | | | sandbox: refactor string-based option-unchanged tests to use a macroNick Mathewson2014-05-22
* | | | | | | sandbox: allow access to cookie files, approved-routersNick Mathewson2014-05-22
* | | | | | | sandbox: allow access to various stats/*-stats filesMichael Wolf2014-05-22
| |_|_|/ / / |/| | | | |
* | | | | | Merge remote-tracking branch 'andrea/bug11476'Nick Mathewson2014-05-22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Eliminate #ifdef ENABLE_MEMPOOLS in packed_cell_new/free()Andrea Shepard2014-05-21
| * | | | | Add --disable-mempools configure optionAndrea Shepard2014-05-12
* | | | | | fix a wide lineNick Mathewson2014-05-20
* | | | | | sandbox: support logfile rotationNick Mathewson2014-05-20
* | | | | | sandbox: tolerate reloading with DirPortFrontPage setNick Mathewson2014-05-20
* | | | | | sandbox: Disallow options which would make us call exec()Nick Mathewson2014-05-20
* | | | | | sandbox: Permit access to stats/dirreq-statsNick Mathewson2014-05-20
* | | | | | Oops; permit rename with the correct filenameNick Mathewson2014-05-20
* | | | | | Fix a sentence that I neverNick Mathewson2014-05-20
* | | | | | Sandbox: allow access to stats/bridge-statsNick Mathewson2014-05-20
* | | | | | note a comment that nickm didn't finishRoger Dingledine2014-05-17
* | | | | | Merge remote-tracking branch 'public/bug11469_024'Nick Mathewson2014-05-15
|\ \ \ \ \ \
| * | | | | | Use DirPort for uploading descriptors.Nick Mathewson2014-05-14
| | |/ / / / | |/| | | |
| * | | | | Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4Nick Mathewson2014-05-07
| |\ \ \ \ \