]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
9 years agosimplify rend_cache_store_status_t back to a boolean
Roger Dingledine [Tue, 8 Mar 2016 00:29:05 +0000 (19:29 -0500)] 
simplify rend_cache_store_status_t back to a boolean

it used to be a tri-state, but now it's just a bi-state, so we can
take out all the machinery like the enum.

9 years agorip out rend_id_is_in_interval()
Roger Dingledine [Fri, 11 Mar 2016 15:46:21 +0000 (10:46 -0500)] 
rip out rend_id_is_in_interval()

it was used by hid_serv_responsible_for_desc_id(), which we no
longer use.

9 years agorip out hid_serv_acting_as_directory()
Roger Dingledine [Fri, 11 Mar 2016 15:45:03 +0000 (10:45 -0500)] 
rip out hid_serv_acting_as_directory()

When we made HidServDirectoryV2 always 1, we removed the situation
where a relay could choose not to be an HSDir. Now simplify the
rest of the code to reflect this decision.

(We have to remove two apparently unrelated free() calls in the unit
tests, since they used to free stuff that we created as a side effect
of calling router_get_my_routerinfo(), and now we no longer call that.)

9 years agorip out hid_serv_responsible_for_desc_id()
Roger Dingledine [Fri, 11 Mar 2016 15:40:31 +0000 (10:40 -0500)] 
rip out hid_serv_responsible_for_desc_id()

This simplifies relay behavior, because the relay offers the hsdir
functionality independent of whether the directory authorities have
decided this relay is suitable for clients to use yet.

Implements ticket 18332.

9 years agoMerge remote-tracking branch 'teor/bug18454'
Nick Mathewson [Fri, 11 Mar 2016 15:22:41 +0000 (10:22 -0500)] 
Merge remote-tracking branch 'teor/bug18454'

9 years agoMerge remote-tracking branch 'public/bug18204_028'
Nick Mathewson [Fri, 11 Mar 2016 15:10:15 +0000 (10:10 -0500)] 
Merge remote-tracking branch 'public/bug18204_028'

9 years agoMove Automake options to configure.ac
cypherpunks [Fri, 26 Feb 2016 12:53:28 +0000 (12:53 +0000)] 
Move Automake options to configure.ac

This will centralize the version configuration in one file to simplify
future changes.

Also fixes some typos in the Automake options comments.

9 years agoAdd changes file for 18448; refactor
Nick Mathewson [Fri, 11 Mar 2016 15:05:28 +0000 (10:05 -0500)] 
Add changes file for 18448; refactor

(I've made it so FreeBSD || FreeBSD_kernel is enough to ensure that
we think you might have ipfw, and so that the logic is all in one
place.)

9 years agoenable and test transproxy on FreeBSD derivatives #18448
Steven Chamberlain [Mon, 29 Feb 2016 14:15:20 +0000 (14:15 +0000)] 
enable and test transproxy on FreeBSD derivatives #18448

The transproxy feature is only enabled when __FreeBSD__ is defined, and
only regular FreeBSD does that.  Change this to __FreeBSD_kernel__ which
is defined on derivatives as well.

This enables the relevant options/validate__transproxy test on FreeBSD
derivatives.

9 years agoDo not link tests against both libor.a and libor-testing.a
Nick Mathewson [Fri, 11 Mar 2016 14:53:25 +0000 (09:53 -0500)] 
Do not link tests against both libor.a and libor-testing.a

Also, put libor-testing.a at a better position in the list of
libraries, to avoid linker errors.

This is a fix, or part of a fix, for 18490.

9 years agomoving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from...
Hassan Alsibyani [Mon, 29 Feb 2016 06:47:51 +0000 (01:47 -0500)] 
moving hid_serv_get_responsible_directories and hid_serv_acting_as_directory from routerlist.c to rendcommon.c

9 years agoFedora Core->Fedora; yum->dnf.
Nick Mathewson [Fri, 11 Mar 2016 14:13:33 +0000 (09:13 -0500)] 
Fedora Core->Fedora; yum->dnf.

Closes 18426 and 18459.

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Wed, 9 Mar 2016 15:37:00 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.7'

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Wed, 9 Mar 2016 15:36:50 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Wed, 9 Mar 2016 15:36:35 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Wed, 9 Mar 2016 15:36:20 +0000 (10:36 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years ago0.2.5.12 got left out of the changelog somehow
Roger Dingledine [Mon, 7 Mar 2016 18:05:40 +0000 (13:05 -0500)] 
0.2.5.12 got left out of the changelog somehow

9 years agoCorrectly duplicate addresses in get_interface_address6_list
teor (Tim Wilson-Brown) [Fri, 4 Mar 2016 17:42:27 +0000 (18:42 +0100)] 
Correctly duplicate addresses in get_interface_address6_list

9 years agoAvoid freeing an uninitialised pointer in get_interface_addresses_ioctl
teor (Tim Wilson-Brown) [Fri, 4 Mar 2016 17:41:49 +0000 (18:41 +0100)] 
Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl

9 years agoUpdate geoip and geoip6 to the March 3 2016 database.
Karsten Loesing [Fri, 4 Mar 2016 09:56:51 +0000 (10:56 +0100)] 
Update geoip and geoip6 to the March 3 2016 database.

9 years agoclean/extend some module docs, including fix from #18403
Nick Mathewson [Sun, 28 Feb 2016 16:57:47 +0000 (17:57 +0100)] 
clean/extend some module docs, including fix from #18403

9 years agoMerge remote-tracking branch 'teor/fallbacks-201602-v2'
Nick Mathewson [Sun, 28 Feb 2016 14:51:22 +0000 (15:51 +0100)] 
Merge remote-tracking branch 'teor/fallbacks-201602-v2'

9 years agoMerge remote-tracking branch 'teor/bug18123'
Nick Mathewson [Sun, 28 Feb 2016 14:40:35 +0000 (15:40 +0100)] 
Merge remote-tracking branch 'teor/bug18123'

9 years agoUse the kdf_rfc5869() function instead of kdf().
Alexander Færøy [Thu, 25 Feb 2016 22:39:14 +0000 (23:39 +0100)] 
Use the kdf_rfc5869() function instead of kdf().

This patch fixes an issue in "ntor_ref.py gen_kdf_vectors" where the
script tries to call the undefined function kdf().

9 years agoMerge remote-tracking branch 'teor/bug17193'
Nick Mathewson [Sun, 28 Feb 2016 14:22:56 +0000 (15:22 +0100)] 
Merge remote-tracking branch 'teor/bug17193'

9 years agoUpdate the copyright year.
Nick Mathewson [Sat, 27 Feb 2016 17:48:19 +0000 (18:48 +0100)] 
Update the copyright year.

9 years agoIt appears I added an empty file by mistake.
Nick Mathewson [Sat, 27 Feb 2016 17:25:51 +0000 (18:25 +0100)] 
It appears I added an empty file by mistake.

9 years agoAdd a brief file-level description for everything in src/common
Nick Mathewson [Sat, 27 Feb 2016 17:19:57 +0000 (18:19 +0100)] 
Add a brief file-level description for everything in src/common

9 years agoMake sure that every module in src/or has a brief description.
Nick Mathewson [Sat, 27 Feb 2016 17:08:24 +0000 (18:08 +0100)] 
Make sure that every module in src/or has a brief description.

9 years agoFix an unused-variable warning
Nick Mathewson [Sat, 27 Feb 2016 09:20:15 +0000 (10:20 +0100)] 
Fix an unused-variable warning

9 years agoMerge branch 'bug18392'
Nick Mathewson [Sat, 27 Feb 2016 09:17:51 +0000 (10:17 +0100)] 
Merge branch 'bug18392'

9 years agoUpdate default fallback directories for 0.2.8.2-alpha (Feb 2016)
teor (Tim Wilson-Brown) [Thu, 18 Feb 2016 12:03:35 +0000 (23:03 +1100)] 
Update default fallback directories for 0.2.8.2-alpha (Feb 2016)

Allow fallback directories which have been stable for 7 days
to work around #18050, which causes relays to submit descriptors
with 0 DirPorts when restarted. (Particularly during Tor version
upgrades.)

Ignore low fallback directory count in alpha builds.
Set the target count to 50.

9 years agoFix minor fallback directory script issues with time zones
teor (Tim Wilson-Brown) [Sat, 27 Feb 2016 09:03:17 +0000 (10:03 +0100)] 
Fix minor fallback directory script issues with time zones

9 years agoCheck if fallback directories can serve the consensus fast enough
teor (Tim Wilson-Brown) [Sat, 27 Feb 2016 09:02:49 +0000 (10:02 +0100)] 
Check if fallback directories can serve the consensus fast enough

9 years agoAdd missing man page option from #4483 (35bbf2e4)
teor (Tim Wilson-Brown) [Fri, 26 Feb 2016 09:58:30 +0000 (10:58 +0100)] 
Add missing man page option from #4483 (35bbf2e4)

TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries

9 years agoSet EXCLUSIVEADDRUSE on Win32 to avoid a local port-stealing attack
teor (Tim Wilson-Brown) [Fri, 26 Feb 2016 09:53:57 +0000 (10:53 +0100)] 
Set EXCLUSIVEADDRUSE on Win32 to avoid a local port-stealing attack

9 years agoMerge remote-tracking branch 'teor/bug18384'
Nick Mathewson [Thu, 25 Feb 2016 18:46:34 +0000 (13:46 -0500)] 
Merge remote-tracking branch 'teor/bug18384'

9 years agoFix check_private_dir() to work on Windows again.
Nick Mathewson [Thu, 25 Feb 2016 18:31:28 +0000 (13:31 -0500)] 
Fix check_private_dir() to work on Windows again.

On windows, you cannot open() a directory.  So for Windows we should
just take our previous stat-based approach.

Closes bug 18392; bug not in any released Tor.

9 years agoChanges file for bug 18384: bugfix on 0f3eeca9 in 0.2.7.2-alpha.
teor (Tim Wilson-Brown) [Thu, 25 Feb 2016 05:57:04 +0000 (13:57 +0800)] 
Changes file for bug 18384: bugfix on 0f3eeca9 in 0.2.7.2-alpha.

9 years agoMake the sandbox work again with chutney.
Nick Mathewson [Wed, 24 Feb 2016 21:01:24 +0000 (16:01 -0500)] 
Make the sandbox work again with chutney.

Previously, we had a problem due to the check_private_dir() rewrite.

Bug not in any released Tor.

9 years agoRepare dependency in "make test-stem".
Nick Mathewson [Wed, 24 Feb 2016 20:49:55 +0000 (15:49 -0500)] 
Repare dependency in "make test-stem".

9 years agoFix a huge number of leaks in test_config.c
Nick Mathewson [Wed, 24 Feb 2016 20:44:40 +0000 (15:44 -0500)] 
Fix a huge number of leaks in test_config.c

I no longer see asan reporting memory leaks in the unit tests.

9 years agoFix memory leaks in routerlist/pick_directory_server_impl test
Nick Mathewson [Wed, 24 Feb 2016 20:13:29 +0000 (15:13 -0500)] 
Fix memory leaks in routerlist/pick_directory_server_impl test

9 years agoFix a leak in test_have_enough_mem_for_dircache
Nick Mathewson [Wed, 24 Feb 2016 20:06:12 +0000 (15:06 -0500)] 
Fix a leak in test_have_enough_mem_for_dircache

9 years agoRemove the freelist from memarea.c
Nick Mathewson [Wed, 24 Feb 2016 19:32:09 +0000 (14:32 -0500)] 
Remove the freelist from memarea.c

This is in accordance with our usual policy against freelists,
now that working allocators are everywhere.

It should also make memarea.c's coverage higher.

I also doubt that this code ever helped performance.

9 years agoSilence clang-scan warnings in ed25519_donna
teor (Tim Wilson-Brown) [Wed, 24 Feb 2016 15:24:01 +0000 (23:24 +0800)] 
Silence clang-scan warnings in ed25519_donna

9 years agoAnother clang+_FORTIFY_SOURCE issue
Nick Mathewson [Mon, 22 Feb 2016 19:07:58 +0000 (14:07 -0500)] 
Another clang+_FORTIFY_SOURCE issue

There was a parenthesis issue in test_util that clang found
confusing.  This part was only in master.

Closes issue 14821.

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Tue, 23 Feb 2016 19:05:54 +0000 (14:05 -0500)] 
Merge branch 'maint-0.2.7'

9 years agoMake clang asan work with FORTIFIED_SOURCE again.
Nick Mathewson [Mon, 22 Feb 2016 19:07:58 +0000 (14:07 -0500)] 
Make clang asan work with FORTIFIED_SOURCE again.

Short version: clang asan hates the glibc strcmp macro in
bits/string2.h if you are passing it a constant string argument of
length two or less.  (I could be off by one here, but that's the
basic idea.)

Closes issue 14821.

9 years agoReplace two instances of N_DIGEST_ALGORITHMS.
Nick Mathewson [Tue, 23 Feb 2016 17:42:10 +0000 (12:42 -0500)] 
Replace two instances of N_DIGEST_ALGORITHMS.

These should have been N_COMMON_DIGEST_ALGORITHMS.

Fixes bug 18380; bug not in any released Tor.

9 years agoDocument required autotools versions
Nick Mathewson [Tue, 23 Feb 2016 16:08:04 +0000 (11:08 -0500)] 
Document required autotools versions

CentOS 6 is roughly the oldest thing we care about developers still
using, and it has autoconf 2.63 / automake 1.11.  These are both
older than openssl 1.0.0, so anybody who can't upgrade past those
probably can't upgrade to a modern openssl either.  And since only
people building from git or editing configure.ac/Makefile.am need to
use autotools, I'm not totally enthused about keeping support for
old ones anyway.

Closes ticket 17732.

9 years agoMerge remote-tracking branch 'arma/bug16825'
Nick Mathewson [Tue, 23 Feb 2016 15:45:39 +0000 (10:45 -0500)] 
Merge remote-tracking branch 'arma/bug16825'

9 years agoMerge remote-tracking branch 'teor/bug18348-v2'
Nick Mathewson [Tue, 23 Feb 2016 12:36:56 +0000 (07:36 -0500)] 
Merge remote-tracking branch 'teor/bug18348-v2'

9 years agoMerge branch 'bug18296_squashed'
Nick Mathewson [Tue, 23 Feb 2016 12:32:18 +0000 (07:32 -0500)] 
Merge branch 'bug18296_squashed'

9 years agoSimple fix for integer overflow in smartlist_heapify.
Nick Mathewson [Wed, 17 Feb 2016 19:19:47 +0000 (14:19 -0500)] 
Simple fix for integer overflow in smartlist_heapify.

9 years agoMerge branch 'bug17795'
Nick Mathewson [Tue, 23 Feb 2016 12:25:12 +0000 (07:25 -0500)] 
Merge branch 'bug17795'

9 years agoFix an erroneous renaming
Nick Mathewson [Tue, 23 Feb 2016 12:22:53 +0000 (07:22 -0500)] 
Fix an erroneous renaming

Did you know that crypto_digest_all is a substring of
crypto_digest_alloc_bytes()?  Hence the mysterious emergence of
"crypto_common_digestsoc_bytes".

Next time I should use the \b assertion in my regexen.

Spotted by Mike.

9 years agoAdd missing check to test_address_get_if_addrs_ifaddrs. Bug 18378
Nick Mathewson [Tue, 23 Feb 2016 12:16:51 +0000 (07:16 -0500)] 
Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378

9 years agoAppease make check-spaces
Andrea Shepard [Tue, 23 Feb 2016 05:07:29 +0000 (05:07 +0000)] 
Appease make check-spaces

9 years agoAnother memory leak in the tests
Nick Mathewson [Mon, 22 Feb 2016 21:20:11 +0000 (16:20 -0500)] 
Another memory leak in the tests

9 years agoSmall fixup on last fix to test leaks
Nick Mathewson [Mon, 22 Feb 2016 21:16:56 +0000 (16:16 -0500)] 
Small fixup on last fix to test leaks

9 years agoFix a bunch of memory leaks in the unit tests
Nick Mathewson [Mon, 22 Feb 2016 21:14:03 +0000 (16:14 -0500)] 
Fix a bunch of memory leaks in the unit tests

9 years agoAdd a missing free in parsing an :auto port
Nick Mathewson [Mon, 22 Feb 2016 20:51:43 +0000 (15:51 -0500)] 
Add a missing free in parsing an :auto port

Fixes bug 18374; bugfix on 0.2.3.3-alpha.

9 years agoasan does not like TO_CONN(NULL)
Nick Mathewson [Mon, 22 Feb 2016 20:45:37 +0000 (15:45 -0500)] 
asan does not like TO_CONN(NULL)

9 years agoDefine O_NOFOLLOW on platforms that do not have it
cypherpunks [Fri, 19 Feb 2016 12:45:36 +0000 (12:45 +0000)] 
Define O_NOFOLLOW on platforms that do not have it

Fixes #18339

9 years agoUpdate to trunnel 1.4.4 to fix 18373
Nick Mathewson [Mon, 22 Feb 2016 19:19:29 +0000 (14:19 -0500)] 
Update to trunnel 1.4.4 to fix 18373

9 years agoMerge branch 'bug16023_028_01_squashed'
Nick Mathewson [Mon, 22 Feb 2016 18:17:58 +0000 (13:17 -0500)] 
Merge branch 'bug16023_028_01_squashed'

9 years agoavoid redundant bootstrap events if the number of descs we just fetched is 0
Roger Dingledine [Mon, 22 Feb 2016 08:02:01 +0000 (03:02 -0500)] 
avoid redundant bootstrap events if the number of descs we just fetched is 0

9 years agoavoid extra LOG_NOTICE for every new microdesc batch
Roger Dingledine [Mon, 22 Feb 2016 07:55:42 +0000 (02:55 -0500)] 
avoid extra LOG_NOTICE for every new microdesc batch

We already write out bootstrapping progress (see bug 9927) per new
microdesc batch. There's no need to do a full "I learned some more
directory information, but not enough to..." line each time too.

9 years agorefactor directory_info_has_arrived so we can quiet the logs
Roger Dingledine [Mon, 22 Feb 2016 07:54:32 +0000 (02:54 -0500)] 
refactor directory_info_has_arrived so we can quiet the logs

no actual behavior changes

9 years agonew microdescs mean progress towards bootstrapping
Roger Dingledine [Mon, 22 Feb 2016 07:47:57 +0000 (02:47 -0500)] 
new microdescs mean progress towards bootstrapping

Now, when a user who has set EntryNodes finishes bootstrapping, Tor
automatically repopulates the guard set based on this new directory
information. Fixes bug 16825; bugfix on 0.2.3.1-alpha.

9 years agofix two typos in comments
Roger Dingledine [Mon, 22 Feb 2016 07:34:50 +0000 (02:34 -0500)] 
fix two typos in comments

9 years agoChanges file for bug 18348.
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 13:03:56 +0000 (00:03 +1100)] 
Changes file for bug 18348.

9 years agoUpdate unit tests for fascist_firewall_choose_address*
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 12:23:29 +0000 (23:23 +1100)] 
Update unit tests for fascist_firewall_choose_address*

Check that clients, bridge clients, and relays choose addresses
as expected.

9 years agoDowngrade directory preference warning to info level
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 12:22:27 +0000 (23:22 +1100)] 
Downgrade directory preference warning to info level

9 years agoIf both IPv4 and IPv6 addresses could be used, choose one correctly
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 09:04:01 +0000 (20:04 +1100)] 
If both IPv4 and IPv6 addresses could be used, choose one correctly

If there is a node, use node_ipv6_or/dir_preferred().
If there is no node, use fascist_firewall_prefer_ipv6_or/dirport().

9 years agoRefactor IPV6_OR_LOOKUP into fascist_firewall_choose_address_rs
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 09:12:17 +0000 (20:12 +1100)] 
Refactor IPV6_OR_LOOKUP into fascist_firewall_choose_address_rs

It's only used once now, so having it as a macro is unhelpful.

9 years agoMake some fascist_firewall_choose_address* functions static
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 09:09:07 +0000 (20:09 +1100)] 
Make some fascist_firewall_choose_address* functions static

9 years agoRefactor fascist_firewall_allows_address without changing behaviour
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 08:32:33 +0000 (19:32 +1100)] 
Refactor fascist_firewall_allows_address without changing behaviour

9 years agoEnsure relays must use IPv4, and can use IPv6
teor (Tim Wilson-Brown) [Sat, 20 Feb 2016 08:28:51 +0000 (19:28 +1100)] 
Ensure relays must use IPv4, and can use IPv6

A mistake in previous refactoring had relays using IPv4 and IPv6.

9 years agoAdd onion address to the HS_DESC UPLOADED event
David Goulet [Wed, 17 Feb 2016 19:34:20 +0000 (14:34 -0500)] 
Add onion address to the HS_DESC UPLOADED event

Fixes #16023

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
9 years agoSet or_ap/dir_ap.port on the invalid addr case. Bug in no released Tor. CID 1353178...
Nick Mathewson [Tue, 16 Feb 2016 17:58:02 +0000 (12:58 -0500)] 
Set or_ap/dir_ap.port on the invalid addr case. Bug in no released Tor. CID 1353178 and 1353179.

9 years agoFix a NULL dereference on unit test failure. CID 1353177.
Nick Mathewson [Tue, 16 Feb 2016 17:55:41 +0000 (12:55 -0500)] 
Fix a NULL dereference on unit test failure. CID 1353177.

9 years agoMerge branch 'bug17852_revised'
Nick Mathewson [Tue, 16 Feb 2016 16:34:06 +0000 (11:34 -0500)] 
Merge branch 'bug17852_revised'

9 years agochanges file for bug17852
Nick Mathewson [Tue, 16 Feb 2016 16:33:21 +0000 (11:33 -0500)] 
changes file for bug17852

9 years agoHarden check_private_dir() to remove any potential race.
Jeremy [Tue, 8 Dec 2015 18:25:15 +0000 (13:25 -0500)] 
Harden check_private_dir() to remove any potential race.

Remove any potential race between stat() and chmod().
Replace stat() with fstat().
Replace chmod() with fchmod()

9 years agosrc/common/util.c:expand_filename() - Perhaps use GetFullPathName() as a form of...
Jeremy [Tue, 1 Dec 2015 20:41:03 +0000 (15:41 -0500)] 
src/common/util.c:expand_filename() - Perhaps use GetFullPathName() as a form of input validation on the filename argument.

9 years agoFix all doxygen warnings other than "X is not documented"
Nick Mathewson [Fri, 12 Feb 2016 03:06:44 +0000 (22:06 -0500)] 
Fix all doxygen warnings other than "X is not documented"

9 years agoMerge branch 'check_log_mutex_uncherrypicked'
Nick Mathewson [Thu, 11 Feb 2016 18:41:31 +0000 (13:41 -0500)] 
Merge branch 'check_log_mutex_uncherrypicked'

9 years agoInitialise logging before trying to use it in unit tests
teor (Tim Wilson-Brown) [Fri, 5 Feb 2016 03:28:53 +0000 (14:28 +1100)] 
Initialise logging before trying to use it in unit tests

9 years agoAdd another admonishment to WritingTests.md
Nick Mathewson [Thu, 11 Feb 2016 18:17:21 +0000 (13:17 -0500)] 
Add another admonishment to WritingTests.md

9 years agoMerge branch 'maint-0.2.7'
Nick Mathewson [Thu, 11 Feb 2016 18:04:43 +0000 (13:04 -0500)] 
Merge branch 'maint-0.2.7'

9 years agoMerge branch 'maint-0.2.6' into maint-0.2.7
Nick Mathewson [Thu, 11 Feb 2016 18:01:46 +0000 (13:01 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7

9 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 11 Feb 2016 17:57:28 +0000 (12:57 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

9 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 11 Feb 2016 17:55:40 +0000 (12:55 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

9 years agoMerge branch 'bug18162_024' into maint-0.2.4
Nick Mathewson [Thu, 11 Feb 2016 17:55:25 +0000 (12:55 -0500)] 
Merge branch 'bug18162_024' into maint-0.2.4

9 years agoMake ensure_capacity a bit more pedantically correct
Nick Mathewson [Thu, 11 Feb 2016 17:54:52 +0000 (12:54 -0500)] 
Make ensure_capacity a bit more pedantically correct

Issues noted by cypherpunks on #18162

9 years agomake check-spaces
Nick Mathewson [Thu, 11 Feb 2016 17:50:55 +0000 (12:50 -0500)] 
make check-spaces

9 years agoMerge branch 'feature17840-v11-tests_truncated'
Nick Mathewson [Thu, 11 Feb 2016 17:45:51 +0000 (12:45 -0500)] 
Merge branch 'feature17840-v11-tests_truncated'

9 years agoMerge remote-tracking branch 'teor/feature17840-v11-merged-v2'
Nick Mathewson [Thu, 11 Feb 2016 17:20:20 +0000 (12:20 -0500)] 
Merge remote-tracking branch 'teor/feature17840-v11-merged-v2'