diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-05-31 14:55:53 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-05-31 14:55:53 +0000 |
| commit | 8324bc512e835f4ff16000ab1dbe7f55e8d110ee (patch) | |
| tree | 7aa135c3182c3a8e733334d3f31b84ae8af5045d /README.mediawiki | |
| parent | ce426ab4e1318c4550cb9e61740620756a49e68b (diff) | |
| parent | ed0f8da4ad97703f1c57919303da082810885fb7 (diff) | |
| download | bips-8324bc512e835f4ff16000ab1dbe7f55e8d110ee.tar.xz | |
Merge branch 'master' into segwit_gbt_updates_20160330
Diffstat (limited to 'README.mediawiki')
| -rw-r--r-- | README.mediawiki | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/README.mediawiki b/README.mediawiki index 974870e..ee7b0d8 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -505,6 +505,18 @@ Those proposing changes should consider that ultimately consent may rest with th | Luke Dashjr | Standard | Draft +|- +| [[bip-0151.mediawiki|151]] +| Peer-to-Peer Communication Encryption +| Jonas Schnelli +| Standard +| Draft +|- +| [[bip-0152.mediawiki|152]] +| Compact Block Relay +| Matt Corallo +| Standard +| Draft |} <!-- IMPORTANT! See the instructions at the top of this page, do NOT JUST add BIPs here! --> |