summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-06-19Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/config.c src/or/or.h
2011-06-17Revert "Add an "auto" option to UseBridges"Nick Mathewson
This reverts commit 507c1257a4d9c629fefc2adbad8db73607749734.
2011-06-17Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-17Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-06-17Abandon rendezvous circuits on SIGNAL NEWNYMRobert Ransom
2011-06-17Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-17Merge branch 'bug3407' into maint-0.2.2Nick Mathewson
2011-06-17Make send_control_event_impl's behaviour saneRobert Ransom
2011-06-17Fix comment typoRobert Ransom
2011-06-17Make connection_printf_to_buf's behaviour saneRobert Ransom
2011-06-17log when we finish ssl handshake and move to renegotiationRoger Dingledine
debug-level since it will be quite common. logged at both client and server side. this step should help us track what's going on with people filtering tor connections by our ssl habits.
2011-06-15Merge remote-tracking branch 'rransom-tor/bug3332-v2'Nick Mathewson
2011-06-14Assert that HS operations are not performed using single-hop circuitsRobert Ransom
(with fixes by Nick Mathewson to unbreak the build)
2011-06-14Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-14Merge remote-tracking branch 'public/bug3369' into maint-0.2.2Nick Mathewson
2011-06-14Merge remote-tracking branch 'rransom-tor/bug3349'Nick Mathewson
2011-06-14Make the get_options() return constNick Mathewson
This lets us make a lot of other stuff const, allows the compiler to generate (slightly) better code, and will make me get slightly fewer patches from folks who stick mutable stuff into or_options_t. const: because not every input is an output!
2011-06-14Fix another check_private_dir instance in masterNick Mathewson
2011-06-14Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-14Make ControlSocketsGroupWritable work with User.Jérémy Bobbio
Original message from bug3393: check_private_dir() to ensure that ControlSocketsGroupWritable is safe to use. Unfortunately, check_private_dir() only checks against the currently running user… which can be root until privileges are dropped to the user and group configured by the User config option. The attached patch fixes the issue by adding a new effective_user argument to check_private_dir() and updating the callers. It might not be the best way to fix the issue, but it did in my tests. (Code by lunar; changelog by nickm)
2011-06-13client-side DNS proxy server: reply NOTIMPL to unsupported queriesintrigeri
Fix for bug 3369.
2011-06-09Upgrade to the latest version of tinytestNick Mathewson
2011-06-08Prefer tt_assert in unit tests, not tor_assertNick Mathewson
2011-06-08Fix a memleak in nodelist_assert_ok()Sebastian Hahn
2011-06-08Fix a rare memleak during stats writingSebastian Hahn
If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak memory.
2011-06-08Don't use signed 1-bit bitfieldsSebastian Hahn
This was harmless, we never compared it to anything but itself or 0. But Coverity complained, and it had a point.
2011-06-08Comment out some obviously dead code.Sebastian Hahn
Coverity warned about it, it's harmless to comment out.
2011-06-08Remove a few dead assignments during router parsingSebastian Hahn
2011-06-08Remove a dead variable in the heartbeat codeSebastian Hahn
2011-06-08Check some more return values in unit testsSebastian Hahn
2011-06-08remove some dead code, found by coveritySebastian Hahn
2011-06-08Fix a minor coverity-found bug in testsSebastian Hahn
2011-06-08Update the uptime string to include an hours indicatorSebastian Hahn
Before, it wasn't really obvious if one meant hours:minutes or minutes:seconds etc.
2011-06-07Fix crash bug (3361) when setting off-flavor networkstatusNick Mathewson
When we set a networkstatus in the non-preferred flavor, we'd check the time in the current_consensus. But that might have been NULL, which could produce a crash as seen in bug 3361.
2011-06-06Merge remote-tracking branch 'asn2/bug3336'Nick Mathewson
2011-06-06Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-06Merge branch 'bug3306_nm_squashed' into maint-0.2.2Nick Mathewson
2011-06-06Detect insanely large circuit build state; don't give its length to rand_intNick Mathewson
2011-06-06Check maximum properly in crypto_rand_int()Nick Mathewson
George Kadianakis notes that if you give crypto_rand_int() a value above INT_MAX, it can return a negative number, which is not what the documentation would imply. The simple solution is to assert that the input is in [1,INT_MAX+1]. If in the future we need a random-value function that can return values up to UINT_MAX, we can add one. Fixes bug 3306; bugfix on 0.2.2pre14.
2011-06-05Add the heartbeat domain in log.c:domain_list[]George Kadianakis
so that parse_log_domain() doesn't fail.
2011-06-05Merge branch 'maint-0.2.2'Roger Dingledine
2011-06-05Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-06-05move to the june 1 2011 maxmind geoip dbRoger Dingledine
2011-06-05Report SIGNAL event to controllers when acting on delayed NEWNYMRobert Ransom
Fixes bug 3349.
2011-06-03Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-03Merge branch 'bug3318c' into maint-0.2.2Nick Mathewson
2011-06-03Reject 128-byte keys that are not 1024-bitNick Mathewson
When we added the check for key size, we required that the keys be 128 bytes. But RSA_size (which defers to BN_num_bytes) will return 128 for keys of length 1017..1024. This patch adds a new crypto_pk_num_bits() that returns the actual number of significant bits in the modulus, and uses that to enforce key sizes. Also, credit the original bug3318 in the changes file.
2011-06-03Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-06-03Use an autobool for UseBridges_Nick Mathewson
2011-06-03Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2Nick Mathewson