]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoChanges file for bug22752 diagnostics
Nick Mathewson [Wed, 28 Jun 2017 18:27:52 +0000 (14:27 -0400)] 
Changes file for bug22752 diagnostics

8 years agoLog real error message when unable to remove a storagedir file
Nick Mathewson [Wed, 28 Jun 2017 18:24:27 +0000 (14:24 -0400)] 
Log real error message when unable to remove a storagedir file

Attempts to help diagnose 22752.

8 years agoReplace crash on missing handle in consdiffmgr with nonfatal assert
Nick Mathewson [Wed, 28 Jun 2017 18:21:21 +0000 (14:21 -0400)] 
Replace crash on missing handle in consdiffmgr with nonfatal assert

Attempts to mitigate 22752.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 18:03:23 +0000 (14:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 18:03:20 +0000 (14:03 -0400)] 
Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 17:58:37 +0000 (13:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9
Nick Mathewson [Wed, 28 Jun 2017 17:57:54 +0000 (13:57 -0400)] 
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:54:00 +0000 (13:54 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid taking redundant ws fix

8 years agowhitespace fix
Nick Mathewson [Wed, 28 Jun 2017 17:53:52 +0000 (13:53 -0400)] 
whitespace fix

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Wed, 28 Jun 2017 17:49:14 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

"Ours" merge to avoid taking backport of 21969

8 years agoMerge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0
Nick Mathewson [Wed, 28 Jun 2017 17:48:52 +0000 (13:48 -0400)] 
Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0

8 years agoFix crash in LZMA module when the Sandbox is enabled.
Alexander Færøy [Wed, 28 Jun 2017 13:57:58 +0000 (09:57 -0400)] 
Fix crash in LZMA module when the Sandbox is enabled.

This patch fixes a crash in our LZMA module where liblzma will allocate
slightly more data than it is allowed to by its limit, which leads to a
crash.

See: https://bugs.torproject.org/22751

8 years agoMerge branch 'ahf_bugs_22702_squashed' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 22:28:34 +0000 (18:28 -0400)] 
Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1

8 years agoAdd changes file for bug #22702.
Alexander Færøy [Tue, 27 Jun 2017 22:21:43 +0000 (22:21 +0000)] 
Add changes file for bug #22702.

See: https://bugs.torproject.org/22702

8 years agoReturn "304 not modified" if a client already have the most recent consensus.
Alexander Færøy [Tue, 27 Jun 2017 17:16:44 +0000 (17:16 +0000)] 
Return "304 not modified" if a client already have the most recent consensus.

This makes our directory code check if a client is trying to fetch a
document that matches a digest from our latest consensus document.

See: https://bugs.torproject.org/22702

8 years agoSet published_out for consensus cache entries in spooled_resource_estimate_size().
Alexander Færøy [Fri, 23 Jun 2017 23:55:54 +0000 (23:55 +0000)] 
Set published_out for consensus cache entries in spooled_resource_estimate_size().

This patch ensures that the published_out output parameter is set to the
current consensus cache entry's "valid after" field.

See: https://bugs.torproject.org/22702

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 27 Jun 2017 15:04:44 +0000 (11:04 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoMerge branch 'bug22737_024' into maint-0.2.4
Nick Mathewson [Tue, 27 Jun 2017 15:04:41 +0000 (11:04 -0400)] 
Merge branch 'bug22737_024' into maint-0.2.4

8 years agoFix an errant memset() into the middle of a struct in cell_pack().
Nick Mathewson [Tue, 27 Jun 2017 14:45:29 +0000 (10:45 -0400)] 
Fix an errant memset() into the middle of a struct in cell_pack().

This mistake causes two possible bugs. I believe they are both
harmless IRL.

BUG 1: memory stomping

When we call the memset, we are overwriting two 0 bytes past the end
of packed_cell_t.body. But I think that's harmless in practice,
because the definition of packed_cell_t is:

// ...
typedef struct packed_cell_t {
  TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
  char body[CELL_MAX_NETWORK_SIZE];
  uint32_t inserted_time;
} packed_cell_t;

So we will overwrite either two bytes of inserted_time, or two bytes
of padding, depending on how the platform handles alignment.

If we're overwriting padding, that's safe.

If we are overwriting the inserted_time field, that's also safe: In
every case where we call cell_pack() from connection_or.c, we ignore
the inserted_time field. When we call cell_pack() from relay.c, we
don't set or use inserted_time until right after we have called
cell_pack(). SO I believe we're safe in that case too.

BUG 2: memory exposure

The original reason for this memset was to avoid the possibility of
accidentally leaking uninitialized ram to the network. Now
remember, if wide_circ_ids is false on a connection, we shouldn't
actually be sending more than 512 bytes of packed_cell_t.body, so
these two bytes can only leak to the network if there is another bug
somewhere else in the code that sends more data than is correct.

Fortunately, in relay.c, where we allocate packed_cell_t in
packed_cell_new() , we allocate it with tor_malloc_zero(), which
clears the RAM, right before we call cell_pack. So those
packed_cell_t.body bytes can't leak any information.

That leaves the two calls to cell_pack() in connection_or.c, which
use stack-alocated packed_cell_t instances.

In or_handshake_state_record_cell(), we pass the cell's contents to
crypto_digest_add_bytes(). When we do so, we get the number of
bytes to pass using the same setting of wide_circ_ids as we passed
to cell_pack(). So I believe that's safe.

In connection_or_write_cell_to_buf(), we also use the same setting
of wide_circ_ids in both calls. So I believe that's safe too.

I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2
back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591

8 years agoMerge branch 'bug22719_031' into maint-0.3.1
Nick Mathewson [Tue, 27 Jun 2017 14:31:33 +0000 (10:31 -0400)] 
Merge branch 'bug22719_031' into maint-0.3.1

8 years agochanges file for bug 22719
Nick Mathewson [Tue, 27 Jun 2017 14:31:03 +0000 (10:31 -0400)] 
changes file for bug 22719

8 years agoMerge branch 'bug22105_031' into maint-0.3.1
Nick Mathewson [Mon, 26 Jun 2017 18:30:17 +0000 (14:30 -0400)] 
Merge branch 'bug22105_031' into maint-0.3.1

8 years agoPatch for 22720 from huyvq: exit(1) more often
Nick Mathewson [Mon, 26 Jun 2017 18:14:56 +0000 (14:14 -0400)] 
Patch for 22720 from huyvq: exit(1) more often

See changes file for full details.

8 years agoMerge branch 'bug22212_squashed' into maint-0.3.1
Nick Mathewson [Mon, 26 Jun 2017 15:27:09 +0000 (11:27 -0400)] 
Merge branch 'bug22212_squashed' into maint-0.3.1

8 years agoChanges file for Bug 22212.
Mike Perry [Fri, 23 Jun 2017 23:10:20 +0000 (19:10 -0400)] 
Changes file for Bug 22212.

8 years agoDemote a log message due to libevent delays.
Mike Perry [Wed, 21 Jun 2017 20:30:53 +0000 (16:30 -0400)] 
Demote a log message due to libevent delays.

This is a side-effect of being single-threaded. The worst cases of this are
actually Bug #16585.

8 years agoFix a coverity warning about a no-op assert with-64 bit size_t
Nick Mathewson [Mon, 26 Jun 2017 14:31:13 +0000 (10:31 -0400)] 
Fix a coverity warning about a no-op assert with-64 bit size_t

This is CID 1403400

8 years agoTry a little harder to make sure we never call tor_compress_process wrong.
Nick Mathewson [Mon, 26 Jun 2017 13:39:59 +0000 (09:39 -0400)] 
Try a little harder to make sure we never call tor_compress_process wrong.

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Thu, 22 Jun 2017 14:56:08 +0000 (10:56 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoCombine our "don't do this if no consensus" entryguards checks
Nick Mathewson [Thu, 22 Jun 2017 13:28:30 +0000 (09:28 -0400)] 
Combine our "don't do this if no consensus" entryguards checks

Suggested by asn on 22400 review.

8 years agoMerge branch 'bug22356_029' into maint-0.3.1
Nick Mathewson [Wed, 21 Jun 2017 17:54:02 +0000 (13:54 -0400)] 
Merge branch 'bug22356_029' into maint-0.3.1

8 years agoMerge branch 'bug22502_redux_031' into maint-0.3.1
Nick Mathewson [Wed, 21 Jun 2017 00:27:48 +0000 (20:27 -0400)] 
Merge branch 'bug22502_redux_031' into maint-0.3.1

8 years agoMerge branch 'bug22672_031' into maint-0.3.1
Nick Mathewson [Wed, 21 Jun 2017 00:26:45 +0000 (20:26 -0400)] 
Merge branch 'bug22672_031' into maint-0.3.1

8 years agoNote that bw_accounting is obsoleted by values in the state file
Nick Mathewson [Tue, 20 Jun 2017 18:18:10 +0000 (14:18 -0400)] 
Note that bw_accounting is obsoleted by values in the state file

Closes ticket 16082.

8 years agoNote that pkgconfig is now needed, and has been for a few releases.
Nick Mathewson [Tue, 20 Jun 2017 17:54:30 +0000 (13:54 -0400)] 
Note that pkgconfig is now needed, and has been for a few releases.

8 years agoMerge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1
Nick Mathewson [Tue, 20 Jun 2017 17:35:38 +0000 (13:35 -0400)] 
Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1

8 years agoEnforce the rule that COMPRESS_OK means progress was made.
Nick Mathewson [Tue, 20 Jun 2017 16:26:57 +0000 (12:26 -0400)] 
Enforce the rule that COMPRESS_OK means progress was made.

If COMPRESS_OK occurs but data is neither consumed nor generated,
treat it as a BUG and a COMPRESS_ERROR.

This change is meant to prevent infinite loops in the case where
we've made a mistake in one of our compression backends.

Closes ticket 22672.

8 years agomingw/windows printf lacks %zd ; use %lu and casts instead
Nick Mathewson [Tue, 20 Jun 2017 16:12:55 +0000 (12:12 -0400)] 
mingw/windows printf lacks %zd ; use %lu and casts instead

(This approach can lose accuracy, but it's only in debug-level messages.)

Fixes windows compilation. Bugfix on recent compress.c changes; bug
not in any released Tor.

8 years agoFix compress_none.c header comment
Taylor Yu [Tue, 20 Jun 2017 15:23:31 +0000 (11:23 -0400)] 
Fix compress_none.c header comment

The Doxygen \file markup for compress_none.c had the wrong filename.
Fixes #22638.

8 years agoSend the correct content-encoding when serving cached_dir_t objects
Nick Mathewson [Tue, 20 Jun 2017 15:26:51 +0000 (11:26 -0400)] 
Send the correct content-encoding when serving cached_dir_t objects

A cached_dir_t object (for now) is always compressed with
DEFLATE_METHOD, but in handle_get_status_vote() to we were using the
general compression-negotiation code decide what compression to
claim we were using.

This was one of the reasons behind 22502.

Fixes bug 22669; bugfix on 0.3.1.1-alpha

8 years agoCorrect the fix to bug 22629 to permit trailing non-garbage
Nick Mathewson [Tue, 20 Jun 2017 14:24:22 +0000 (10:24 -0400)] 
Correct the fix to bug 22629 to permit trailing non-garbage

This change makes it so that we can decompress concatenated zstd
outputs.

8 years agoAdd a unit test for decompressing concatenated inputs.
Nick Mathewson [Tue, 20 Jun 2017 14:21:35 +0000 (10:21 -0400)] 
Add a unit test for decompressing concatenated inputs.

8 years agoadd a changes file for 22626, 22628, and 22629 (parts of 22502)
Nick Mathewson [Tue, 20 Jun 2017 14:12:40 +0000 (10:12 -0400)] 
add a changes file for 22626, 22628, and 22629 (parts of 22502)

8 years agoMerge remote-tracking branch 'teor/bug22502' into maint-0.3.1
Nick Mathewson [Tue, 20 Jun 2017 14:04:16 +0000 (10:04 -0400)] 
Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1

8 years agoDon't expand guard sample set unless consensus is "reasonably live"
Nick Mathewson [Mon, 19 Jun 2017 19:48:47 +0000 (15:48 -0400)] 
Don't expand guard sample set unless consensus is "reasonably live"

Fixes what I think is the main root cause of 22400. Bugfix on
0.3.0.1-alpha.

8 years agoRemove hardwired libfuzzer path; closes 22105.
Nick Mathewson [Mon, 19 Jun 2017 19:35:46 +0000 (15:35 -0400)] 
Remove hardwired libfuzzer path; closes 22105.

8 years agoDowngrade "assign_to_cpuworker failed" to INFO.
Nick Mathewson [Mon, 19 Jun 2017 19:24:33 +0000 (15:24 -0400)] 
Downgrade "assign_to_cpuworker failed" to INFO.

Closes ticket 22356

8 years agoMerge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 19 Jun 2017 17:52:19 +0000 (13:52 -0400)] 
Merge branch 'maint-0.3.0' into maint-0.3.1

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 19 Jun 2017 17:52:19 +0000 (13:52 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
Nick Mathewson [Mon, 19 Jun 2017 17:50:49 +0000 (13:50 -0400)] 
Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9

8 years agoDocument more files in the datadirectory.
Nick Mathewson [Mon, 19 Jun 2017 13:57:57 +0000 (09:57 -0400)] 
Document more files in the datadirectory.

This improved list comes from the ls -R results that weasel and ln5
sent me.  Thanks!

8 years agoDocument sr-random and diff-cache.
Nick Mathewson [Fri, 16 Jun 2017 18:44:04 +0000 (14:44 -0400)] 
Document sr-random and diff-cache.

8 years agoDocument key-pinning-journal
Nick Mathewson [Fri, 16 Jun 2017 18:26:21 +0000 (14:26 -0400)] 
Document key-pinning-journal

Closes 22347

8 years agoPermit the fchmod system call.
Nick Mathewson [Fri, 16 Jun 2017 18:03:02 +0000 (14:03 -0400)] 
Permit the fchmod system call.

Fixes bug 22516; bugfix on 0.2.5.4-alpha.

8 years agoAdd extra logging during compression and decompression
teor [Thu, 15 Jun 2017 23:48:18 +0000 (09:48 +1000)] 
Add extra logging during compression and decompression

This helps diagnose failures.

Part of #22502.

8 years agoReturn TOR_COMPRESS_BUFFER_FULL when zstd has additional input
teor [Thu, 15 Jun 2017 23:47:32 +0000 (09:47 +1000)] 
Return TOR_COMPRESS_BUFFER_FULL when zstd has additional input

Fixes #22628.

8 years agoRemove a redundant conditional in tor_zstd_compress_process
teor [Thu, 15 Jun 2017 23:46:46 +0000 (09:46 +1000)] 
Remove a redundant conditional in tor_zstd_compress_process

Part of #22502

8 years agoMove a comment to the right place in tor_zstd_compress_process
teor [Thu, 15 Jun 2017 23:45:58 +0000 (09:45 +1000)] 
Move a comment to the right place in tor_zstd_compress_process

Part of #22502

8 years agoCheck for trailing input garbage in tor_compress_impl() when decompressing
teor [Thu, 15 Jun 2017 23:41:29 +0000 (09:41 +1000)] 
Check for trailing input garbage in tor_compress_impl() when decompressing

Fixes #22629.

8 years agoCheck if tor_compress_new() returns NULL in tor_compress_impl()
teor [Thu, 15 Jun 2017 23:38:18 +0000 (09:38 +1000)] 
Check if tor_compress_new() returns NULL in tor_compress_impl()

Partial fix to 22626.

8 years agoRemove old callgraph scripts; recommend calltool instead.
Nick Mathewson [Wed, 14 Jun 2017 21:44:15 +0000 (17:44 -0400)] 
Remove old callgraph scripts; recommend calltool instead.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 9 Jun 2017 13:58:46 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Fri, 9 Jun 2017 13:58:46 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Fri, 9 Jun 2017 13:58:46 +0000 (09:58 -0400)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Fri, 9 Jun 2017 13:58:45 +0000 (09:58 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

8 years agoUpdate geoip and geoip6 to the June 8 2017 database.
Karsten Loesing [Fri, 9 Jun 2017 13:47:49 +0000 (15:47 +0200)] 
Update geoip and geoip6 to the June 8 2017 database.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Thu, 8 Jun 2017 18:06:49 +0000 (14:06 -0400)] 
Merge branch 'maint-0.3.0'

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 8 Jun 2017 18:06:41 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 8 Jun 2017 18:06:28 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Thu, 8 Jun 2017 18:06:16 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Thu, 8 Jun 2017 18:06:06 +0000 (14:06 -0400)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Thu, 8 Jun 2017 18:05:59 +0000 (14:05 -0400)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 8 Jun 2017 18:05:37 +0000 (14:05 -0400)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid version bump.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:32 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:29 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:27 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:22 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:18 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:16 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:13 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agoAdd -dev to version number.
Nick Mathewson [Thu, 8 Jun 2017 18:05:08 +0000 (14:05 -0400)] 
Add -dev to version number.

8 years agofwd-port more changelogs (0.2.4 through 0.2.8) tor-0.3.1.3-alpha
Nick Mathewson [Thu, 8 Jun 2017 14:15:41 +0000 (10:15 -0400)] 
fwd-port more changelogs (0.2.4 through 0.2.8)

8 years agoTweak 0.2.9.11 changelog
Nick Mathewson [Thu, 8 Jun 2017 13:48:12 +0000 (09:48 -0400)] 
Tweak 0.2.9.11 changelog

8 years agocopy changelog and releasenotes forward from 0.2.9, 0.3.0
Nick Mathewson [Thu, 8 Jun 2017 13:35:47 +0000 (09:35 -0400)] 
copy changelog and releasenotes forward from 0.2.9, 0.3.0

8 years agoFold TROVE-2017-00[45] into changelog
Nick Mathewson [Thu, 8 Jun 2017 13:32:00 +0000 (09:32 -0400)] 
Fold TROVE-2017-00[45] into changelog

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Thu, 8 Jun 2017 13:29:36 +0000 (09:29 -0400)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Thu, 8 Jun 2017 13:29:23 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Thu, 8 Jun 2017 13:29:12 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Thu, 8 Jun 2017 13:29:05 +0000 (09:29 -0400)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

"ours" merge to avoid version bump.